From 08c4f1dd3a67fba540f67f7b3a10619c162c7a36 Mon Sep 17 00:00:00 2001 From: VigersRay Date: Wed, 29 May 2024 20:53:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=81=D1=82=D0=B0=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=BE=D1=82=D0=BE=D1=82=D0=B8=D0=BF=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototypes/Accents/word_replacements.yml | 339 ++++- .../Catalog/Cargo/cargo_engines.yml | 2 +- .../Catalog/Cargo/cargo_materials.yml | 2 +- .../Fills/Backpacks/StarterGear/backpack.yml | 3 +- .../Fills/Backpacks/StarterGear/duffelbag.yml | 3 +- .../Fills/Backpacks/StarterGear/satchel.yml | 3 +- .../Catalog/Fills/Backpacks/duffelbag.yml | 22 +- .../Catalog/Fills/Books/bookshelf.yml | 3 + .../Catalog/Fills/Boxes/general.yml | 2 +- .../Catalog/Fills/Boxes/medical.yml | 12 +- .../Catalog/Fills/Crates/syndicate.yml | 2 +- .../Catalog/Fills/Items/briefcases.yml | 2 +- .../Catalog/Fills/Lockers/heads.yml | 18 + .../Catalog/Fills/Lockers/security.yml | 10 + .../VendingMachines/Inventories/boozeomat.yml | 1 + .../VendingMachines/Inventories/curadrobe.yml | 2 +- .../VendingMachines/Inventories/detdrobe.yml | 1 + .../VendingMachines/Inventories/games.yml | 1 + .../VendingMachines/Inventories/lawdrobe.yml | 12 +- .../VendingMachines/Inventories/vendomat.yml | 2 + .../Prototypes/Catalog/uplink_catalog.yml | 12 +- .../Clothing/Head/hardsuit-helmets.yml | 34 +- .../Entities/Clothing/Neck/mantles.yml | 33 +- .../Entities/Clothing/Shoes/boots.yml | 3 + .../Entities/Clothing/Shoes/specific.yml | 3 + .../Entities/Clothing/Uniforms/jumpskirts.yml | 2 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 18 +- .../Markers/Spawners/Random/maintenance.yml | 11 + .../Markers/Spawners/Random/posters.yml | 2 +- .../Markers/Spawners/Random/pottedplants.yml | 7 + .../Entities/Markers/Spawners/jobs.yml | 2 +- .../Mobs/Customization/Markings/cat_parts.yml | 4 +- .../Mobs/Customization/Markings/cyberlibs.yml | 1105 +++++++++++++++++ .../Mobs/Cyborgs/base_borg_chassis.yml | 10 +- .../Entities/Mobs/Cyborgs/borg_chassis.yml | 2 + .../Prototypes/Entities/Mobs/NPCs/pets.yml | 2 + .../Entities/Mobs/NPCs/revenant.yml | 6 +- .../Prototypes/Entities/Mobs/NPCs/silicon.yml | 2 + .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 2 + .../Entities/Mobs/Player/admin_ghost.yml | 24 +- .../Prototypes/Entities/Mobs/Player/human.yml | 4 +- .../Entities/Mobs/Player/humanoid.yml | 8 +- .../Entities/Mobs/Species/diona.yml | 1 + Resources/Prototypes/Entities/Mobs/base.yml | 1 + .../Objects/Decoration/containers.yml | 157 +++ .../reinforcement_teleporter.yml | 3 +- .../Prototypes/Entities/Objects/Fun/pai.yml | 2 + .../Entities/Objects/Fun/puppet.yml | 4 + .../Entities/Objects/Misc/fluff_lights.yml | 3 + .../Entities/Objects/Misc/implanters.yml | 6 +- .../Entities/Objects/Misc/paper.yml | 6 + .../Entities/Objects/Misc/rubber_stamp.yml | 2 +- .../Objects/Specific/Hydroponics/leaves.yml | 2 +- .../Objects/Specific/Mech/mecha_equipment.yml | 1 + .../Specific/Medical/healthanalyzer.yml | 2 + .../Objects/Specific/Medical/hypospray.yml | 8 +- .../Objects/Specific/Robotics/mmi.yml | 2 + .../Objects/Specific/chemical-containers.yml | 2 +- .../Entities/Objects/Tools/cable_coils.yml | 10 + .../Guns/Ammunition/Magazines/shotgun.yml | 2 +- .../Weapons/Guns/Shotguns/shotguns.yml | 15 +- .../Entities/Objects/Weapons/security.yml | 3 +- .../Prototypes/Entities/Objects/base_item.yml | 2 + .../Doors/Airlocks/base_structureairlocks.yml | 1 + .../Structures/Doors/Airlocks/highsec.yml | 1 + .../Structures/Furniture/potted_plants.yml | 2 +- .../Structures/Machines/Computers/frame.yml | 2 + .../Structures/Machines/fax_machine.yml | 2 + .../Entities/Structures/Machines/lathe.yml | 14 +- .../Structures/Machines/vending_machines.yml | 4 +- .../Power/Generation/Singularity/emitter.yml | 6 +- .../Structures/Storage/Closets/big_boxes.yml | 2 +- .../Structures/Storage/Tanks/tanks.yml | 16 +- .../Structures/Wallmounts/air_alarm.yml | 4 +- .../Entities/Structures/Windows/mining.yml | 2 +- .../Entities/Structures/Windows/plasma.yml | 2 +- .../Structures/Windows/reinforced.yml | 2 +- .../Entities/Structures/Windows/rplasma.yml | 2 +- .../Entities/Structures/Windows/ruranium.yml | 2 +- .../Entities/Structures/Windows/shuttle.yml | 2 +- .../Entities/Structures/Windows/uranium.yml | 2 +- .../Entities/Structures/Windows/window.yml | 4 +- .../Entities/Structures/base_structure.yml | 2 + .../Entities/Structures/hydro_tray.yml | 2 + Resources/Prototypes/GameRules/events.yml | 44 +- Resources/Prototypes/GameRules/midround.yml | 4 +- .../Jobs/Command/head_of_personnel.yml | 4 +- .../Jobs/Engineering/station_engineer.yml | 4 +- .../Loadouts/Jobs/Medical/medical_doctor.yml | 4 +- .../Jobs/Security/security_officer.yml | 2 +- .../Prototypes/Loadouts/role_loadouts.yml | 40 +- Resources/Prototypes/Maps/bagel.yml | 3 +- Resources/Prototypes/Maps/box.yml | 3 +- Resources/Prototypes/Maps/cluster.yml | 5 +- Resources/Prototypes/Maps/core.yml | 3 +- Resources/Prototypes/Maps/europa.yml | 3 +- Resources/Prototypes/Maps/fland.yml | 3 +- Resources/Prototypes/Maps/marathon.yml | 3 +- Resources/Prototypes/Maps/meta.yml | 3 +- Resources/Prototypes/Maps/oasis.yml | 5 +- Resources/Prototypes/Maps/omega.yml | 3 +- Resources/Prototypes/Maps/origin.yml | 3 +- Resources/Prototypes/Maps/packed.yml | 3 +- Resources/Prototypes/Maps/train.yml | 3 +- Resources/Prototypes/Objectives/ninja.yml | 4 +- .../Prototypes/Objectives/objectiveGroups.yml | 2 +- .../Prototypes/Recipes/Lathes/clothing.yml | 11 + .../Prototypes/Recipes/Lathes/medical.yml | 8 - Resources/Prototypes/Roles/Antags/nukeops.yml | 18 +- .../Prototypes/Roles/Antags/revolutionary.yml | 3 + Resources/Prototypes/Roles/Antags/traitor.yml | 3 + Resources/Prototypes/Roles/Antags/zombie.yml | 3 + .../Roles/Jobs/Cargo/quartermaster.yml | 19 +- .../Roles/Jobs/Cargo/salvage_specialist.yml | 4 +- .../Roles/Jobs/Civilian/assistant.yml | 4 +- .../Roles/Jobs/Civilian/bartender.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/chef.yml | 2 +- .../Prototypes/Roles/Jobs/Civilian/clown.yml | 3 + .../Prototypes/Roles/Jobs/Civilian/lawyer.yml | 1 + .../Prototypes/Roles/Jobs/Civilian/mime.yml | 4 +- .../Roles/Jobs/Civilian/musician.yml | 2 +- .../Roles/Jobs/Civilian/service_worker.yml | 2 +- .../Roles/Jobs/Civilian/visitor.yml | 4 +- .../Prototypes/Roles/Jobs/Command/captain.yml | 19 +- .../Roles/Jobs/Command/centcom_official.yml | 5 +- .../Roles/Jobs/Command/head_of_personnel.yml | 17 +- .../Engineering/atmospheric_technician.yml | 2 +- .../Roles/Jobs/Engineering/chief_engineer.yml | 17 +- .../Jobs/Engineering/station_engineer.yml | 2 +- .../Jobs/Engineering/technical_assistant.yml | 2 +- .../Roles/Jobs/Fun/misc_startinggear.yml | 8 +- .../Prototypes/Roles/Jobs/Medical/chemist.yml | 2 +- .../Jobs/Medical/chief_medical_officer.yml | 17 +- .../Roles/Jobs/Medical/medical_doctor.yml | 2 +- .../Roles/Jobs/Medical/medical_intern.yml | 2 +- .../Roles/Jobs/Science/research_assistant.yml | 2 +- .../Roles/Jobs/Science/research_director.yml | 13 +- .../Roles/Jobs/Science/scientist.yml | 2 +- .../Roles/Jobs/Security/detective.yml | 4 +- .../Roles/Jobs/Security/head_of_security.yml | 17 +- .../Roles/Jobs/Security/security_cadet.yml | 10 +- .../Roles/Jobs/Security/security_officer.yml | 4 +- .../Prototypes/Roles/Jobs/Security/warden.yml | 8 +- .../Prototypes/Roles/Jobs/departments.yml | 3 +- .../Prototypes/SoundCollections/NukeMusic.yml | 3 +- .../Prototypes/SoundCollections/lobby.yml | 2 + .../Prototypes/SoundCollections/troll.yml | 5 + Resources/Prototypes/Species/arachnid.yml | 3 +- Resources/Prototypes/Species/diona.yml | 3 +- Resources/Prototypes/Species/human.yml | 10 +- Resources/Prototypes/Species/moth.yml | 3 +- Resources/Prototypes/Species/slime.yml | 8 + .../Prototypes/Species/species_weights.yml | 7 + Resources/Prototypes/Species/vox.yml | 9 +- Resources/Prototypes/StatusEffects/job.yml | 2 +- .../Prototypes/StatusEffects/security.yml | 2 +- Resources/Prototypes/StatusEffects/ssd.yml | 2 +- Resources/Prototypes/StatusIcon/antag.yml | 4 +- Resources/Prototypes/Tiles/planet.yml | 14 +- Resources/Prototypes/typing_indicator.yml | 13 +- 160 files changed, 2202 insertions(+), 338 deletions(-) create mode 100644 Resources/Prototypes/Entities/Mobs/Customization/Markings/cyberlibs.yml create mode 100644 Resources/Prototypes/Entities/Objects/Decoration/containers.yml diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 9a801d786de..82a79eb6cbf 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -1,4 +1,4 @@ -# Accents that work off of word replacements. +# Accents that work off of word replacements. # this is kind of dumb but localization demands it. # i guess you could just specify the prefix ('mobster') and count and let the system fill it @@ -75,6 +75,51 @@ accent-italian-words-47: accent-italian-words-replace-47 accent-italian-words-48: accent-italian-words-replace-48 accent-italian-words-49: accent-italian-words-replace-49 +# Corvax accent start + accent-italian-words-301: accent-italian-words-replace-301 + accent-italian-words-401: accent-italian-words-replace-401 + accent-italian-words-402: accent-italian-words-replace-402 + accent-italian-words-403: accent-italian-words-replace-403 + accent-italian-words-501: accent-italian-words-replace-501 + accent-italian-words-502: accent-italian-words-replace-502 + accent-italian-words-601: accent-italian-words-replace-601 + accent-italian-words-701: accent-italian-words-replace-701 + accent-italian-words-702: accent-italian-words-replace-702 + accent-italian-words-801: accent-italian-words-replace-801 + accent-italian-words-802: accent-italian-words-replace-802 + accent-italian-words-803: accent-italian-words-replace-803 + accent-italian-words-804: accent-italian-words-replace-804 + accent-italian-words-805: accent-italian-words-replace-805 + accent-italian-words-901: accent-italian-words-replace-901 + accent-italian-words-1001: accent-italian-words-replace-1001 + accent-italian-words-1101: accent-italian-words-replace-1101 + accent-italian-words-1102: accent-italian-words-replace-1102 + accent-italian-words-1103: accent-italian-words-replace-1103 + accent-italian-words-1501: accent-italian-words-replace-1501 + accent-italian-words-1701: accent-italian-words-replace-1701 + accent-italian-words-1702: accent-italian-words-replace-1702 + accent-italian-words-1703: accent-italian-words-replace-1703 + accent-italian-words-1801: accent-italian-words-replace-1801 + accent-italian-words-1901: accent-italian-words-replace-1901 + accent-italian-words-2001: accent-italian-words-replace-2001 + accent-italian-words-2002: accent-italian-words-replace-2002 + accent-italian-words-2003: accent-italian-words-replace-2003 + accent-italian-words-2101: accent-italian-words-replace-2101 + accent-italian-words-2301: accent-italian-words-replace-2301 + accent-italian-words-2801: accent-italian-words-replace-2801 + accent-italian-words-3001: accent-italian-words-replace-3001 + accent-italian-words-3002: accent-italian-words-replace-3002 + accent-italian-words-3101: accent-italian-words-replace-3101 + accent-italian-words-3102: accent-italian-words-replace-3102 + accent-italian-words-3201: accent-italian-words-replace-3201 + accent-italian-words-3202: accent-italian-words-replace-3202 + accent-italian-words-3203: accent-italian-words-replace-3203 + accent-italian-words-3401: accent-italian-words-replace-3401 + accent-italian-words-3402: accent-italian-words-replace-3402 + accent-italian-words-3701: accent-italian-words-replace-3701 + accent-italian-words-3801: accent-italian-words-replace-3801 + accent-italian-words-4301: accent-italian-words-replace-4301 +# Corvax accent end - type: accent id: dwarf @@ -366,6 +411,83 @@ accent-cowboy-words-97: accent-cowboy-replacement-97 accent-cowboy-words-98: accent-cowboy-replacement-98 accent-cowboy-words-99: accent-cowboy-replacement-99 + # Corvax-accent-start + corvax-accent-cowboy-words-1: corvax-accent-cowboy-replacement-1 + corvax-accent-cowboy-words-2: corvax-accent-cowboy-replacement-2 + corvax-accent-cowboy-words-301: corvax-accent-cowboy-replacement-3 + corvax-accent-cowboy-words-302: corvax-accent-cowboy-replacement-3 + corvax-accent-cowboy-words-4: corvax-accent-cowboy-replacement-4 + corvax-accent-cowboy-words-501: corvax-accent-cowboy-replacement-5 + corvax-accent-cowboy-words-502: corvax-accent-cowboy-replacement-5 + corvax-accent-cowboy-words-601: corvax-accent-cowboy-replacement-6 + corvax-accent-cowboy-words-602: corvax-accent-cowboy-replacement-6 + corvax-accent-cowboy-words-7: corvax-accent-cowboy-replacement-7 + corvax-accent-cowboy-words-8: corvax-accent-cowboy-replacement-8 + corvax-accent-cowboy-words-9: corvax-accent-cowboy-replacement-9 + corvax-accent-cowboy-words-1001: corvax-accent-cowboy-replacement-10 + corvax-accent-cowboy-words-1002: corvax-accent-cowboy-replacement-10 + corvax-accent-cowboy-words-1101: corvax-accent-cowboy-replacement-11 + corvax-accent-cowboy-words-1102: corvax-accent-cowboy-replacement-11 + corvax-accent-cowboy-words-1201: corvax-accent-cowboy-replacement-12 + corvax-accent-cowboy-words-1202: corvax-accent-cowboy-replacement-12 + corvax-accent-cowboy-words-13: corvax-accent-cowboy-replacement-13 + corvax-accent-cowboy-words-1401: corvax-accent-cowboy-replacement-14 + corvax-accent-cowboy-words-1402: corvax-accent-cowboy-replacement-14 + corvax-accent-cowboy-words-15: corvax-accent-cowboy-replacement-15 + corvax-accent-cowboy-words-16: corvax-accent-cowboy-replacement-16 + corvax-accent-cowboy-words-1701: corvax-accent-cowboy-replacement-17 + corvax-accent-cowboy-words-1702: corvax-accent-cowboy-replacement-17 + corvax-accent-cowboy-words-1801: corvax-accent-cowboy-replacement-18 + corvax-accent-cowboy-words-1802: corvax-accent-cowboy-replacement-18 + corvax-accent-cowboy-words-1803: corvax-accent-cowboy-replacement-18 + corvax-accent-cowboy-words-1901: corvax-accent-cowboy-replacement-19 + corvax-accent-cowboy-words-1902: corvax-accent-cowboy-replacement-19 + corvax-accent-cowboy-words-20: corvax-accent-cowboy-replacement-20 + corvax-accent-cowboy-words-21: corvax-accent-cowboy-replacement-21 + corvax-accent-cowboy-words-22: corvax-accent-cowboy-replacement-22 + corvax-accent-cowboy-words-23: corvax-accent-cowboy-replacement-23 + corvax-accent-cowboy-words-2401: corvax-accent-cowboy-replacement-24 + corvax-accent-cowboy-words-2402: corvax-accent-cowboy-replacement-24 + corvax-accent-cowboy-words-2403: corvax-accent-cowboy-replacement-24 + corvax-accent-cowboy-words-2404: corvax-accent-cowboy-replacement-24 + corvax-accent-cowboy-words-2501: corvax-accent-cowboy-replacement-25 + corvax-accent-cowboy-words-2502: corvax-accent-cowboy-replacement-25 + corvax-accent-cowboy-words-2503: corvax-accent-cowboy-replacement-25 + corvax-accent-cowboy-words-26: corvax-accent-cowboy-replacement-26 + corvax-accent-cowboy-words-27: corvax-accent-cowboy-replacement-27 + corvax-accent-cowboy-words-28: corvax-accent-cowboy-replacement-28 + corvax-accent-cowboy-words-29: corvax-accent-cowboy-replacement-29 + corvax-accent-cowboy-words-30: corvax-accent-cowboy-replacement-30 + corvax-accent-cowboy-words-31: corvax-accent-cowboy-replacement-31 + corvax-accent-cowboy-words-32: corvax-accent-cowboy-replacement-32 + corvax-accent-cowboy-words-33: corvax-accent-cowboy-replacement-33 + corvax-accent-cowboy-words-34: corvax-accent-cowboy-replacement-34 + corvax-accent-cowboy-words-35: corvax-accent-cowboy-replacement-35 + corvax-accent-cowboy-words-36: corvax-accent-cowboy-replacement-36 + corvax-accent-cowboy-words-3701: corvax-accent-cowboy-replacement-37 + corvax-accent-cowboy-words-3702: corvax-accent-cowboy-replacement-37 + corvax-accent-cowboy-words-38: corvax-accent-cowboy-replacement-38 + corvax-accent-cowboy-words-39: corvax-accent-cowboy-replacement-39 + corvax-accent-cowboy-words-40: corvax-accent-cowboy-replacement-40 + corvax-accent-cowboy-words-41: corvax-accent-cowboy-replacement-41 + corvax-accent-cowboy-words-42: corvax-accent-cowboy-replacement-42 + corvax-accent-cowboy-words-43: corvax-accent-cowboy-replacement-43 + corvax-accent-cowboy-words-44: corvax-accent-cowboy-replacement-44 + corvax-accent-cowboy-words-45: corvax-accent-cowboy-replacement-45 + corvax-accent-cowboy-words-46: corvax-accent-cowboy-replacement-46 + corvax-accent-cowboy-words-47: corvax-accent-cowboy-replacement-47 + corvax-accent-cowboy-words-48: corvax-accent-cowboy-replacement-48 + corvax-accent-cowboy-words-49: corvax-accent-cowboy-replacement-49 + corvax-accent-cowboy-words-50: corvax-accent-cowboy-replacement-50 + corvax-accent-cowboy-words-51: corvax-accent-cowboy-replacement-51 + corvax-accent-cowboy-words-52: corvax-accent-cowboy-replacement-52 + corvax-accent-cowboy-words-53: corvax-accent-cowboy-replacement-53 + corvax-accent-cowboy-words-54: corvax-accent-cowboy-replacement-54 + corvax-accent-cowboy-words-5501: corvax-accent-cowboy-replacement-55 + corvax-accent-cowboy-words-5502: corvax-accent-cowboy-replacement-55 + corvax-accent-cowboy-words-56: corvax-accent-cowboy-replacement-56 + corvax-accent-cowboy-words-57: corvax-accent-cowboy-replacement-57 + # Corvax-accent-end - type: accent id: southern @@ -381,50 +503,177 @@ - type: accent id: chatsanitize wordReplacements: - chatsan-word-1: chatsan-replacement-1 - chatsan-word-2: chatsan-replacement-2 - chatsan-word-3: chatsan-replacement-3 - chatsan-word-4: chatsan-replacement-4 - chatsan-word-5: chatsan-replacement-5 - chatsan-word-6: chatsan-replacement-6 - chatsan-word-7: chatsan-replacement-7 - chatsan-word-8: chatsan-replacement-8 - chatsan-word-9: chatsan-replacement-9 - chatsan-word-10: chatsan-replacement-10 - chatsan-word-11: chatsan-replacement-11 - chatsan-word-12: chatsan-replacement-12 - chatsan-word-13: chatsan-replacement-13 - chatsan-word-14: chatsan-replacement-14 - chatsan-word-15: chatsan-replacement-15 - chatsan-word-16: chatsan-replacement-16 - chatsan-word-17: chatsan-replacement-17 - chatsan-word-18: chatsan-replacement-18 - chatsan-word-19: chatsan-replacement-19 - chatsan-word-20: chatsan-replacement-20 - chatsan-word-21: chatsan-replacement-please - chatsan-word-22: chatsan-replacement-please - chatsan-word-23: chatsan-replacement-please - chatsan-word-24: chatsan-replacement-24 - chatsan-word-25: chatsan-replacement-25 - chatsan-word-26: chatsan-replacement-26 - chatsan-word-27: chatsan-replacement-27 - chatsan-word-28: chatsan-replacement-28 - chatsan-word-29: chatsan-replacement-29 - chatsan-word-30: chatsan-replacement-30 - chatsan-word-31: chatsan-replacement-31 - chatsan-word-32: chatsan-replacement-32 - chatsan-word-33: chatsan-replacement-33 - chatsan-word-34: chatsan-replacement-34 - chatsan-word-35: chatsan-replacement-35 - chatsan-word-36: chatsan-replacement-36 - chatsan-word-37: chatsan-replacement-37 - chatsan-word-38: chatsan-replacement-38 - chatsan-word-39: chatsan-replacement-etcetera - chatsan-word-40: chatsan-replacement-etcetera - chatsan-word-41: chatsan-replacement-41 - chatsan-word-42: chatsan-replacement-42 - chatsan-word-43: chatsan-replacement-43 - chatsan-word-44: chatsan-replacement-44 + # Corvax-ChatSanitize-Start +# chatsan-word-1: chatsan-replacement-1 +# chatsan-word-2: chatsan-replacement-2 +# chatsan-word-3: chatsan-replacement-3 +# chatsan-word-4: chatsan-replacement-4 +# chatsan-word-5: chatsan-replacement-5 +# chatsan-word-6: chatsan-replacement-6 +# chatsan-word-7: chatsan-replacement-7 +# chatsan-word-8: chatsan-replacement-8 +# chatsan-word-9: chatsan-replacement-9 +# chatsan-word-10: chatsan-replacement-10 +# chatsan-word-11: chatsan-replacement-11 +# chatsan-word-12: chatsan-replacement-12 +# chatsan-word-13: chatsan-replacement-13 +# chatsan-word-14: chatsan-replacement-14 +# chatsan-word-15: chatsan-replacement-15 +# chatsan-word-16: chatsan-replacement-16 +# chatsan-word-17: chatsan-replacement-17 +# chatsan-word-18: chatsan-replacement-18 +# chatsan-word-19: chatsan-replacement-19 +# chatsan-word-20: chatsan-replacement-20 +# chatsan-word-21: chatsan-replacement-please +# chatsan-word-22: chatsan-replacement-please +# chatsan-word-23: chatsan-replacement-please +# chatsan-word-24: chatsan-replacement-24 +# chatsan-word-25: chatsan-replacement-25 +# chatsan-word-26: chatsan-replacement-26 +# chatsan-word-27: chatsan-replacement-27 +# chatsan-word-28: chatsan-replacement-28 +# chatsan-word-29: chatsan-replacement-29 +# chatsan-word-30: chatsan-replacement-30 +# chatsan-word-31: chatsan-replacement-31 +# chatsan-word-32: chatsan-replacement-32 +# chatsan-word-33: chatsan-replacement-33 +# chatsan-word-34: chatsan-replacement-34 +# chatsan-word-35: chatsan-replacement-35 +# chatsan-word-36: chatsan-replacement-36 +# chatsan-word-37: chatsan-replacement-37 +# chatsan-word-38: chatsan-replacement-38 +# chatsan-word-39: chatsan-replacement-etcetera +# chatsan-word-40: chatsan-replacement-etcetera +# chatsan-word-41: chatsan-replacement-41 +# chatsan-word-42: chatsan-replacement-42 +# chatsan-word-43: chatsan-replacement-43 +# chatsan-word-44: chatsan-replacement-44 + corvax-chatsan-word-1: corvax-chatsan-replacement-1 + corvax-chatsan-word-2: corvax-chatsan-replacement-2 + corvax-chatsan-word-3: corvax-chatsan-replacement-3 + corvax-chatsan-word-4: corvax-chatsan-replacement-4 + corvax-chatsan-word-5: corvax-chatsan-replacement-5 + corvax-chatsan-word-6: corvax-chatsan-replacement-6 + corvax-chatsan-word-7: corvax-chatsan-replacement-7 + corvax-chatsan-word-8: corvax-chatsan-replacement-8 + corvax-chatsan-word-9: corvax-chatsan-replacement-9 + corvax-chatsan-word-10: corvax-chatsan-replacement-10 + corvax-chatsan-word-11: corvax-chatsan-replacement-11 + corvax-chatsan-word-12: corvax-chatsan-replacement-12 + corvax-chatsan-word-13: corvax-chatsan-replacement-13 + corvax-chatsan-word-14: corvax-chatsan-replacement-14 + corvax-chatsan-word-15: corvax-chatsan-replacement-15 + corvax-chatsan-word-16: corvax-chatsan-replacement-16 + corvax-chatsan-word-17: corvax-chatsan-replacement-17 + corvax-chatsan-word-18: corvax-chatsan-replacement-18 + corvax-chatsan-word-19: corvax-chatsan-replacement-19 + corvax-chatsan-word-20: corvax-chatsan-replacement-20 + corvax-chatsan-word-21: corvax-chatsan-replacement-21 + corvax-chatsan-word-22: corvax-chatsan-replacement-22 + corvax-chatsan-word-23: corvax-chatsan-replacement-23 + corvax-chatsan-word-24: corvax-chatsan-replacement-24 + corvax-chatsan-word-25: corvax-chatsan-replacement-25 + corvax-chatsan-word-26: corvax-chatsan-replacement-26 + corvax-chatsan-word-27: corvax-chatsan-replacement-27 + corvax-chatsan-word-28: corvax-chatsan-replacement-28 + corvax-chatsan-word-29: corvax-chatsan-replacement-29 + corvax-chatsan-word-30: corvax-chatsan-replacement-30 + corvax-chatsan-word-31: corvax-chatsan-replacement-31 + corvax-chatsan-word-32: corvax-chatsan-replacement-32 + corvax-chatsan-word-33: corvax-chatsan-replacement-33 + corvax-chatsan-word-34: corvax-chatsan-replacement-34 + corvax-chatsan-word-35: corvax-chatsan-replacement-35 + corvax-chatsan-word-36: corvax-chatsan-replacement-36 + corvax-chatsan-word-37: corvax-chatsan-replacement-37 + corvax-chatsan-word-38: corvax-chatsan-replacement-38 + corvax-chatsan-word-39: corvax-chatsan-replacement-39 + corvax-chatsan-word-40: corvax-chatsan-replacement-40 + corvax-chatsan-word-41: corvax-chatsan-replacement-41 + corvax-chatsan-word-42: corvax-chatsan-replacement-42 + corvax-chatsan-word-43: corvax-chatsan-replacement-43 + corvax-chatsan-word-44: corvax-chatsan-replacement-44 + corvax-chatsan-word-45: corvax-chatsan-replacement-45 + corvax-chatsan-word-46: corvax-chatsan-replacement-46 + corvax-chatsan-word-47: corvax-chatsan-replacement-47 + corvax-chatsan-word-48: corvax-chatsan-replacement-48 + corvax-chatsan-word-49: corvax-chatsan-replacement-49 + corvax-chatsan-word-50: corvax-chatsan-replacement-50 + corvax-chatsan-word-51: corvax-chatsan-replacement-51 + corvax-chatsan-word-52: corvax-chatsan-replacement-52 + corvax-chatsan-word-53: corvax-chatsan-replacement-53 + corvax-chatsan-word-54: corvax-chatsan-replacement-54 + corvax-chatsan-word-55: corvax-chatsan-replacement-55 + corvax-chatsan-word-56: corvax-chatsan-replacement-56 + corvax-chatsan-word-57: corvax-chatsan-replacement-57 + corvax-chatsan-word-58: corvax-chatsan-replacement-58 + corvax-chatsan-word-59: corvax-chatsan-replacement-59 + corvax-chatsan-word-60: corvax-chatsan-replacement-60 + corvax-chatsan-word-61: corvax-chatsan-replacement-61 + corvax-chatsan-word-62: corvax-chatsan-replacement-62 + corvax-chatsan-word-63: corvax-chatsan-replacement-63 + corvax-chatsan-word-64: corvax-chatsan-replacement-64 + corvax-chatsan-word-65: corvax-chatsan-replacement-65 + corvax-chatsan-word-66: corvax-chatsan-replacement-66 + corvax-chatsan-word-67: corvax-chatsan-replacement-67 + corvax-chatsan-word-68: corvax-chatsan-replacement-68 + corvax-chatsan-word-69: corvax-chatsan-replacement-69 + corvax-chatsan-word-70: corvax-chatsan-replacement-70 + corvax-chatsan-word-71: corvax-chatsan-replacement-71 + corvax-chatsan-word-72: corvax-chatsan-replacement-72 + corvax-chatsan-word-73: corvax-chatsan-replacement-73 + corvax-chatsan-word-74: corvax-chatsan-replacement-74 + corvax-chatsan-word-75: corvax-chatsan-replacement-75 + corvax-chatsan-word-76: corvax-chatsan-replacement-76 + corvax-chatsan-word-77: corvax-chatsan-replacement-77 + corvax-chatsan-word-78: corvax-chatsan-replacement-78 + corvax-chatsan-word-79: corvax-chatsan-replacement-79 + corvax-chatsan-word-80: corvax-chatsan-replacement-80 + corvax-chatsan-word-81: corvax-chatsan-replacement-81 + corvax-chatsan-word-82: corvax-chatsan-replacement-82 + corvax-chatsan-word-83: corvax-chatsan-replacement-83 + corvax-chatsan-word-84: corvax-chatsan-replacement-84 + corvax-chatsan-word-85: corvax-chatsan-replacement-85 + corvax-chatsan-word-86: corvax-chatsan-replacement-86 + corvax-chatsan-word-87: corvax-chatsan-replacement-87 + corvax-chatsan-word-88: corvax-chatsan-replacement-88 + corvax-chatsan-word-89: corvax-chatsan-replacement-89 + corvax-chatsan-word-90: corvax-chatsan-replacement-90 + corvax-chatsan-word-91: corvax-chatsan-replacement-91 + corvax-chatsan-word-92: corvax-chatsan-replacement-92 + corvax-chatsan-word-93: corvax-chatsan-replacement-93 + corvax-chatsan-word-94: corvax-chatsan-replacement-94 + corvax-chatsan-word-95: corvax-chatsan-replacement-95 + corvax-chatsan-word-96: corvax-chatsan-replacement-96 + corvax-chatsan-word-97: corvax-chatsan-replacement-97 + corvax-chatsan-word-98: corvax-chatsan-replacement-98 + corvax-chatsan-word-99: corvax-chatsan-replacement-99 + corvax-chatsan-word-100: corvax-chatsan-replacement-100 + corvax-chatsan-word-101: corvax-chatsan-replacement-101 + corvax-chatsan-word-102: corvax-chatsan-replacement-102 + corvax-chatsan-word-103: corvax-chatsan-replacement-103 + corvax-chatsan-word-104: corvax-chatsan-replacement-104 + corvax-chatsan-word-105: corvax-chatsan-replacement-105 + corvax-chatsan-word-106: corvax-chatsan-replacement-106 + corvax-chatsan-word-107: corvax-chatsan-replacement-107 + corvax-chatsan-word-108: corvax-chatsan-replacement-108 + corvax-chatsan-word-109: corvax-chatsan-replacement-109 + corvax-chatsan-word-110: corvax-chatsan-replacement-110 + corvax-chatsan-word-111: corvax-chatsan-replacement-111 + corvax-chatsan-word-112: corvax-chatsan-replacement-112 + corvax-chatsan-word-113: corvax-chatsan-replacement-113 + corvax-chatsan-word-114: corvax-chatsan-replacement-114 + corvax-chatsan-word-115: corvax-chatsan-replacement-115 + corvax-chatsan-word-116: corvax-chatsan-replacement-116 + corvax-chatsan-word-117: corvax-chatsan-replacement-117 + corvax-chatsan-word-118: corvax-chatsan-replacement-118 + corvax-chatsan-word-119: corvax-chatsan-replacement-119 + corvax-chatsan-word-120: corvax-chatsan-replacement-120 + corvax-chatsan-word-121: corvax-chatsan-replacement-121 + corvax-chatsan-word-122: corvax-chatsan-replacement-122 + corvax-chatsan-word-123: corvax-chatsan-replacement-123 + corvax-chatsan-word-124: corvax-chatsan-replacement-124 + corvax-chatsan-word-125: corvax-chatsan-replacement-125 + # Corvax-ChatSanitize-End - type: accent id: liar diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 8d3bea5075c..5028f987f06 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -34,7 +34,7 @@ description: "Contains an emitter. Used only for dangerous applications." icon: sprite: Structures/Power/Generation/Singularity/emitter.rsi - state: emitter2 + state: emitter # Corvax-Resprite product: CrateEngineeringSingularityEmitter cost: 3000 category: cargoproduct-category-name-engineering diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 6f945001d93..cf9078010db 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -62,7 +62,7 @@ id: MaterialPlasma icon: sprite: Objects/Materials/Sheets/other.rsi - state: plasma_3 + state: plasma # Corvax-Resprite product: CrateMaterialPlasma cost: 2000 category: cargoproduct-category-name-materials diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 71c679a2aa5..325a0a47a8a 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -71,9 +71,10 @@ - id: Flash #- name: StationCharter #- name: TelescopicBaton + - type: entity noSpawn: true - parent: ClothingBackpackEngineering + parent: ClothingBackpackCE # Corvax-Resprite id: ClothingBackpackChiefEngineerFilled components: - type: StorageFill diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index 477b8b2f185..ba130c7e495 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -79,9 +79,10 @@ - id: Flash #- name: StationCharter #- name: TelescopicBaton + - type: entity noSpawn: true - parent: ClothingBackpackDuffelEngineering + parent: ClothingBackpackDuffelCE # Corvax-Resprite id: ClothingBackpackDuffelChiefEngineerFilled components: - type: StorageFill diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index fe411688298..66ae0d29ae9 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -93,9 +93,10 @@ - id: Flash #- name: StationCharter #- name: TelescopicBaton + - type: entity noSpawn: true - parent: ClothingBackpackSatchelEngineering + parent: ClothingBackpackSatchelCE # Corvax-Resprite id: ClothingBackpackSatchelChiefEngineerFilled components: - type: StorageFill diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml index 4e4b6d93826..18b1c2170b8 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml @@ -55,7 +55,7 @@ components: - type: StorageFill contents: - - id: WeaponShotgunBulldog + - id: WeaponShotgunBulldogBiocode # Sunrise-edit - id: MagazineShotgun - id: MagazineShotgun - id: MagazineShotgunBeanbag @@ -69,7 +69,7 @@ components: - type: StorageFill contents: - - id: WeaponSubMachineGunC20r + - id: WeaponSubMachineGunC20rBiocode # Sunrise-edit - id: MagazinePistolSubMachineGun amount: 2 # - id: SMGSuppressor @@ -82,7 +82,7 @@ components: - type: StorageFill contents: - - id: WeaponRevolverPythonAP + - id: WeaponRevolverPythonAPBiocode # Sunrise-edit - id: SpeedLoaderMagnumAP amount: 2 @@ -94,7 +94,7 @@ components: - type: StorageFill contents: - - id: WeaponLightMachineGunL6 + - id: WeaponLightMachineGunL6Biocode # Sunrise-edit - id: MagazineLightRifleBox - type: entity @@ -105,7 +105,7 @@ components: - type: StorageFill contents: - - id: WeaponLauncherChinaLake + - id: WeaponLauncherChinaLakeBiocode # Sunrise-edit - id: GrenadeBlast amount: 4 - id: GrenadeFrag @@ -119,7 +119,7 @@ components: - type: StorageFill contents: - - id: WeaponRifleM90GrenadeLauncher + - id: WeaponRifleM90GrenadeLauncherBiocode # Sunrise-edit - id: MagazineRifle amount: 2 - id: GrenadeBlast @@ -272,7 +272,7 @@ components: - type: StorageFill contents: - - id: ClothingOuterHardsuitSyndie + - id: ClothingOuterHardsuitSyndieBiocode # Sunrise-edit - id: ClothingMaskGasSyndicate - id: ClothingHandsGlovesCombat - id: DoubleEmergencyOxygenTankFilled @@ -286,7 +286,7 @@ components: - type: StorageFill contents: - - id: ClothingOuterHardsuitSyndieElite + - id: ClothingOuterHardsuitSyndieEliteBiocode # Sunrise-edit - id: ClothingMaskGasSyndicate - id: ClothingHandsGlovesCombat - id: DoubleEmergencyOxygenTankFilled @@ -314,7 +314,7 @@ - type: StorageFill contents: - id: SyringeRomerol - - id: WeaponRevolverPython + - id: WeaponRevolverPythonBiocode # Sunrise-edit - id: MagazineBoxMagnumIncendiary - id: PillAmbuzolPlus - id: PillAmbuzol @@ -328,7 +328,7 @@ - type: StorageFill contents: - id: BoxSurvivalSyndicate - - id: WeaponPistolViper + - id: WeaponPistolViperBiocode # Sunrise-edit - id: PinpointerSyndicateNuclear - id: DeathAcidifierImplanter @@ -346,7 +346,7 @@ - id: SawAdvanced - id: Cautery - id: CombatKnife - - id: WeaponPistolViper + - id: WeaponPistolViperBiocode # Sunrise-edit - id: PinpointerSyndicateNuclear - id: HandheldHealthAnalyzer - id: CombatMedipen diff --git a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml index b52e8530085..4dea4598f27 100644 --- a/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml +++ b/Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml @@ -122,6 +122,9 @@ - id: BookJourney prob: 0.1 orGroup: BookAuthor + - id: BookBusido # Corvax-Books + prob: 0.1 + orGroup: BookAuthor - id: BookInspiration prob: 0.1 orGroup: BookAuthor diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 5b3f88c1bbd..abbf80d2dc7 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -126,7 +126,7 @@ - type: Sprite layers: - state: box - - state: pda + - state: id # Corvax-Resprite - type: entity name: headset box diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml index d9beb724356..d7dd6c5a61a 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/medical.yml @@ -10,7 +10,7 @@ amount: 6 - type: Sprite layers: - - state: box + - state: box_medical # Corvax-Resprite - state: syringe - type: entity @@ -25,7 +25,7 @@ amount: 9 - type: Sprite layers: - - state: box + - state: box_medical # Corvax-Resprite - state: pillbox - type: entity @@ -55,7 +55,7 @@ amount: 4 - type: Sprite layers: - - state: box + - state: box_medical # Corvax-Resprite - state: sterile - type: entity @@ -70,7 +70,7 @@ amount: 4 - type: Sprite layers: - - state: box + - state: box_medical # Corvax-Resprite - state: latex - type: entity @@ -85,7 +85,7 @@ amount: 4 - type: Sprite layers: - - state: box + - state: box_medical # Corvax-Resprite - state: nitrile - type: entity @@ -100,7 +100,7 @@ amount: 4 - type: Sprite layers: - - state: box + - state: box_medical # Corvax-Resprite - state: bodybags whitelist: tags: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml index 3f9e909c809..ca0c74019c1 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/syndicate.yml @@ -16,7 +16,7 @@ components: - type: StorageFill contents: - - id: ClothingOuterHardsuitJuggernaut + - id: ClothingOuterHardsuitJuggernautBiocode - id: ClothingMaskGasSyndicate - id: ClothingHandsGlovesCombat - id: DoubleEmergencyOxygenTankFilled diff --git a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml index 58a49aa6e95..7e1fd8d8711 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/briefcases.yml @@ -21,7 +21,7 @@ - 0,0,6,3 - type: StorageFill contents: - - id: WeaponSniperHristov + - id: WeaponSniperHristovBiocode # Sunrise-edit - id: MagazineBoxAntiMateriel - id: ClothingNeckTieRed - id: ClothingHandsGlovesLatex diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml index e38d57e6d82..6107ff9a7d2 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml @@ -19,6 +19,7 @@ - id: RubberStampApproved - id: ClothingHeadsetAltCargo - id: BoxEncryptionKeyCargo + - id: PrinterDocFlatpack # Corvax-Printer - type: entity id: LockerCaptainFilledHardsuit @@ -73,6 +74,10 @@ - id: WeaponAntiqueLaser - id: JetpackCaptainFilled - id: MedalCase + # Corvax-Resprite-Start + - id: ClothingHeadCaptainHat + - id: ClothingOuterCoatCaptain + # Corvax-Resprite-End - type: entity id: LockerCaptainFilledNoLaser @@ -126,7 +131,9 @@ - id: BoxEncryptionKeyService - id: ClothingBackpackIan prob: 0.5 + - id: ClothingOuterCoatHOP # Corvax-Resprite - id: AccessConfigurator + - id: PrinterDocFlatpack # Corvax-Printer - type: entity id: LockerChiefEngineerFilledHardsuit @@ -260,10 +267,17 @@ - type: StorageFill contents: - id: WeaponDisabler + - id: ClothingHeadHatCapHoS # Corvax-SecFashion + prob: 0.5 - id: ClothingOuterCoatHoSTrench - id: ClothingMaskNeckGaiter + - id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite - id: ClothingOuterHardsuitSecurityRed - id: ClothingMaskGasSwat +# - id: ClothingShoeSlippersDuck # Corvax-Resprite: Need more space for style +# prob: 0.2 + - id: DrinkVacuumFlask + prob: 0.8 - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - id: ClothingEyesGlassesSecurity @@ -277,6 +291,7 @@ - id: BoxEncryptionKeySecurity - id: HoloprojectorSecurity - id: BookSecretDocuments + - id: BookBusido # Corvax-Books - type: entity id: LockerHeadOfSecurityFilled @@ -286,8 +301,11 @@ - type: StorageFill contents: - id: WeaponDisabler + - id: ClothingHeadHatCapHoS # Corvax-SecFashion + prob: 0.5 - id: ClothingOuterCoatHoSTrench - id: ClothingMaskNeckGaiter + - id: ClothingOuterCoatHoSGreatcoat # Corvax-Resprite - id: ClothingBeltSecurityFilled - id: ClothingHeadsetAltSecurity - id: ClothingEyesGlassesSecurity diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 2896494978a..258142572f6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -29,6 +29,7 @@ contents: - id: FlashlightSeclite - id: WeaponDisabler + - id: ClothingHeadHatCapWardenAlt # Corvax-SecFashion - id: ClothingBeltSecurityFilled - id: Flash - id: ClothingEyesGlassesSecurity @@ -37,6 +38,7 @@ - id: ClothingShoesBootsJack - id: ClothingOuterCoatWarden - id: ClothingOuterWinterWarden + - id: ClothingOuterCoatWardenAlt # Corvax-SecFashion - id: RubberStampWarden - id: DoorRemoteArmory - id: HoloprojectorSecurity @@ -64,6 +66,8 @@ - id: ClothingShoesBootsJack - id: WeaponMeleeNeedle prob: 0.1 + - id: ClothingOuterCoatSecurityOvercoat # Corvax-SecFashion + prob: 0.2 - id: HoloprojectorSecurity prob: 0.6 @@ -101,6 +105,11 @@ prob: 0.7 - id: ClothingNeckCloakMoth #bzzz Moth-pocalypse prob: 0.15 + - id: ClothingHeadHelmetSecurityMedic # Corvax-Resprite + - id: ClothingOuterVestSecurityMedic # Corvax-Resprite + prob: 0.5 + - id: ClothingOuterCoatLabSecurityMedic # Corvax-Resprite + prob: 0.5 - type: entity id: LockerDetectiveFilled @@ -122,6 +131,7 @@ - id: DrinkDetFlask - id: ClothingHandsGlovesForensic - id: RubberStampDetective + - id: BookBusido # Corvax-Books - id: HoloprojectorSecurity - id: BoxEvidenceMarkers diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml index e4f4440bd3c..e327f5a0fc0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml @@ -11,6 +11,7 @@ DrinkIceBucket: 2 BarSpoon: 3 CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers + DrinkCampariBottleFull: 5 # Corvax DrinkAbsintheBottleFull: 2 DrinkAleBottleFull: 5 DrinkBeerBottleFull: 5 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml index fe332ea52dc..43fbf14eb35 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml @@ -14,4 +14,4 @@ ClothingUniformJumpskirtLibrarian: 3 ClothingShoesBootsLaceup: 2 ClothingHeadsetService: 2 - + PrinterDocFlatpack: 2 # Corvax-Printer diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml index 91e45c83916..c30f15b5249 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/detdrobe.yml @@ -5,6 +5,7 @@ ClothingUniformJumpskirtDetective: 2 ClothingShoesColorBrown: 2 ClothingOuterCoatDetectiveLoadout: 2 + ClothingOuterCoatDetectiveDark: 2 # Corvax-Resprite-Detective ClothingHeadHatFedoraBrown: 2 ClothingUniformJumpsuitDetectiveGrey: 2 ClothingUniformJumpskirtDetectiveGrey: 2 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml index f022b4b9a59..9f8a65dc11b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/games.yml @@ -8,6 +8,7 @@ BackgammonBoard: 1 ParchisBoard: 1 CheckerBoard: 1 + BookStationsAndAgents: 4 # Corvax-Tabletop ShipBattlemap: 1 SnowBattlemap: 1 SandBattlemap: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml index 28f63e44e20..7b509bd9cbd 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml @@ -12,9 +12,19 @@ ClothingUniformJumpsuitLawyerGood: 1 ClothingUniformJumpskirtLawyerGood: 1 ClothingShoesBootsLaceup: 2 - ClothingHeadsetService: 2 + ClothingHeadsetIAA: 2 # Corvax-IAA ClothingNeckLawyerbadge: 2 BriefcaseBrown: 2 + # Corvax-LawyerDrip-Start + ClothingHandsGlovesColorWhite: 1 + ClothingHandsGlovesColorGray: 1 + ClothingHandsGlovesColorBlack: 1 + ClothingHandsGlovesColorRed: 1 + ClothingHandsGlovesColorBlue: 1 + ClothingHeadHatBowlerHat: 1 + ClothingHeadHatOutlawHat: 1 + ClothingHeadHatTophat: 1 + # Corvax-LawyerDrip-End LuxuryPen: 2 contrabandInventory: ClothingOuterRobesJudge: 1 diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml index da7e30fd763..636c134da7c 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/vendomat.yml @@ -1,6 +1,8 @@ - type: vendingMachineInventory id: VendomatInventory startingInventory: + HandheldRoboAnalyzer: 4 + Nanopaste: 4 RemoteSignaller: 1 Igniter: 2 Wirecutter: 1 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c8d6eb4f618..c4e5be5306a 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -5,7 +5,7 @@ id: UplinkPistolViper name: uplink-pistol-viper-name description: uplink-pistol-viper-desc - productEntity: WeaponPistolViper + productEntity: WeaponPistolViperBiocode # Sunrise-edit cost: Telecrystal: 3 categories: @@ -15,7 +15,7 @@ id: UplinkRevolverPython name: uplink-revolver-python-name description: uplink-revolver-python-desc - productEntity: WeaponRevolverPythonAP + productEntity: WeaponRevolverPythonAPBiocode # Sunrise-edit cost: Telecrystal: 8 # Originally was 13 TC but was not used due to high cost categories: @@ -26,7 +26,7 @@ id: UplinkPistolCobra name: uplink-pistol-cobra-name description: uplink-pistol-cobra-desc - productEntity: WeaponPistolCobra + productEntity: WeaponPistolCobraBiocode # Sunrise-edit cost: Telecrystal: 4 categories: @@ -48,7 +48,7 @@ name: uplink-esword-name description: uplink-esword-desc icon: { sprite: /Textures/Objects/Weapons/Melee/e_sword.rsi, state: icon } - productEntity: EnergySword + productEntity: EnergySwordBiocode # Sunrise-edit cost: Telecrystal: 8 categories: @@ -122,7 +122,7 @@ name: uplink-sniper-bundle-name description: uplink-sniper-bundle-desc icon: { sprite: /Textures/Objects/Weapons/Guns/Snipers/heavy_sniper.rsi, state: base } - productEntity: BriefcaseSyndieSniperBundleFilled + productEntity: BriefcaseSyndieSniperBundleFilled cost: Telecrystal: 12 categories: @@ -1004,7 +1004,7 @@ Telecrystal: 6 categories: - UplinkAllies - + - type: listing id: UplinkSyndicatePersonalAI name: uplink-syndicate-pai-name diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index 072dd53d9ae..6d632d75c23 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -221,7 +221,7 @@ - type: Clothing sprite: Clothing/Head/Hardsuits/security-warden.rsi - type: PointLight - color: "#ffeead" + color: cyan # Corvax-Resprite - type: PressureProtection highPressureMultiplier: 0.525 lowPressureMultiplier: 1000 @@ -235,7 +235,7 @@ #Captain's Hardsuit - type: entity - parent: ClothingHeadHardsuitWithLightBase + parent: ClothingHeadHardsuitBase id: ClothingHeadHelmetHardsuitCap name: captain's hardsuit helmet description: Special hardsuit helmet, made for the captain of the station. @@ -261,8 +261,8 @@ sprite: Clothing/Head/Hardsuits/engineering-white.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/engineering-white.rsi - - type: PointLight - color: "#daffad" + - type: PointLight # Corvax-Resprite + color: "#e6aa5c" - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 @@ -297,8 +297,8 @@ sprite: Clothing/Head/Hardsuits/rd.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/rd.rsi - - type: PointLight - color: "#d6adff" + - type: PointLight # Corvax-Resprite + color: "#a4fef4" - type: PressureProtection highPressureMultiplier: 0.60 lowPressureMultiplier: 1000 @@ -454,7 +454,7 @@ #Cybersun Juggernaut Hardsuit - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase # Corvax-Resprite id: ClothingHeadHelmetHardsuitCybersun name: cybersun juggernaut helmet description: Made of compressed red matter, this helmet was designed in the Tau chromosphere facility. @@ -464,6 +464,8 @@ sprite: Clothing/Head/Hardsuits/cybersun.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/cybersun.rsi + - type: PointLight # Corvax-Resprite + color: red - type: PressureProtection highPressureMultiplier: 0.3 lowPressureMultiplier: 1000 @@ -488,7 +490,7 @@ - type: Clothing sprite: Clothing/Head/Hardsuits/wizard.rsi - type: PointLight - color: "#ffadfb" + color: "#a4fef4" # Corvax-Resprite - type: PressureProtection highPressureMultiplier: 0.27 lowPressureMultiplier: 1000 @@ -563,8 +565,8 @@ sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/ERThelmets/ertleader.rsi - - type: PointLight - color: "#addbff" + - type: PointLight # Corvax-Resprite + color: cyan - type: Armor modifiers: coefficients: @@ -601,7 +603,7 @@ - type: Clothing sprite: Clothing/Head/Hardsuits/ERThelmets/ertengineer.rsi - type: PointLight - color: "#f4ffad" + color: cyan # Corvax-Resprite - type: Armor modifiers: coefficients: @@ -638,7 +640,7 @@ - type: Clothing sprite: Clothing/Head/Hardsuits/ERThelmets/ertsecurity.rsi - type: PointLight - color: "#ffadc6" + color: cyan # Corvax-Resprite - type: Armor modifiers: coefficients: @@ -687,7 +689,7 @@ - state: equipped-head-unshaded shader: unshaded - type: PointLight - color: orange + color: "#a4fef4" # Corvax-Resprite - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 @@ -703,7 +705,7 @@ #Deathsquad Hardsuit - type: entity - parent: ClothingHeadHardsuitBase + parent: ClothingHeadHardsuitWithLightBase # Corvax-Resprite id: ClothingHeadHelmetHardsuitDeathsquad name: deathsquad hardsuit helmet description: A robust helmet for special operations. @@ -713,6 +715,8 @@ sprite: Clothing/Head/Hardsuits/deathsquad.rsi - type: Clothing sprite: Clothing/Head/Hardsuits/deathsquad.rsi + - type: PointLight # Corvax-Resprite + color: cyan - type: PressureProtection highPressureMultiplier: 0.08 lowPressureMultiplier: 1000 @@ -741,6 +745,8 @@ sprite: Clothing/Head/Hardsuits/clown.rsi equipSound: /Audio/Mecha/mechmove03.ogg unequipSound: /Audio/Effects/Emotes/parp1.ogg + - type: PointLight # Corvax-Resprite + color: "#ff3399" #Mime Hardsuit - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index f9dee8ba7db..83963fae191 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -2,7 +2,7 @@ parent: ClothingNeckBase id: ClothingNeckMantleCap name: captain's mantle - description: A comfortable and chique mantle befitting of only the most experienced captain. + description: A formal mantle to drape around the shoulders. Others stand on the shoulders of giants. You're the giant they stand on. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Neck/mantles/capmantle.rsi @@ -13,51 +13,62 @@ parent: ClothingNeckBase id: ClothingNeckMantleCE name: chief engineer's mantle - description: High visibility, check. RIG system, check. High capacity cell, check. Everything a chief engineer could need in a stylish mantle. + description: A bright white and yellow striped mantle. Do not wear around active machinery. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Neck/mantles/cemantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/cemantle.rsi - + - type: entity parent: ClothingNeckBase id: ClothingNeckMantleCMO name: chief medical officer's mantle - description: For a CMO that has been in enough medbays to know that more PPE means less central command dry cleaning visits when the shift is over. + description: A light blue shoulder draping for THE medical professional. Contrasts well with blood. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Neck/mantles/cmomantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/cmomantle.rsi - + - type: entity parent: ClothingNeckBase id: ClothingNeckMantleHOP name: head of personnel's mantle - description: A good HOP knows that paper pushing is only half the job... petting your dog and looking fashionable is the other half. + description: A decorative draping of blue and red over your shoulders, signifying your stamping prowess. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Neck/mantles/hopmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/hopmantle.rsi - + - type: entity parent: ClothingNeckBase id: ClothingNeckMantleHOS name: head of security's mantle - description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. + description: A plated mantle that one might wrap around the upper torso. The 'scales' of the garment signify the members of security and how you're carrying them on your shoulders. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Neck/mantles/hosmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/hosmantle.rsi - + +- type: entity # Corvax-Resprite: Old mantle renamed and saved as that new entity + parent: ClothingNeckBase + id: ClothingNeckMantleHOSShoulder + name: head of security's shoulder mantle + description: Shootouts with nukies are just another Tuesday for this HoS. This mantle is a symbol of commitment to the station. + components: + - type: Sprite + sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi + - type: Clothing + sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi + - type: entity parent: ClothingNeckBase id: ClothingNeckMantleRD name: research director's mantle - description: For when long days in the office consist of explosives, poisonous gas, murder robots, and a fresh pizza from cargo; this mantle will keep you comfy. + description: A terribly comfortable shoulder draping for the discerning scientist of fashion. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Neck/mantles/rdmantle.rsi @@ -73,4 +84,4 @@ - type: Sprite sprite: Clothing/Neck/mantles/qmmantle.rsi - type: Clothing - sprite: Clothing/Neck/mantles/qmmantle.rsi + sprite: Clothing/Neck/mantles/qmmantle.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index af32fa58184..43e38c4934c 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -20,6 +20,9 @@ sprite: Clothing/Shoes/Boots/jackboots.rsi - type: Clothing sprite: Clothing/Shoes/Boots/jackboots.rsi + - type: FootstepModifier # Corvax-Sounds + footstepSoundCollection: + collection: FootstepBoots - type: entity parent: ClothingShoesBaseButcherable diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 4ae752345a7..4fa7fcc1505 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -109,6 +109,9 @@ - type: Clothing sprite: Clothing/Shoes/Specific/galoshes.rsi - type: NoSlip + - type: ClothingSpeedModifier # Corvax-MRP + walkModifier: 0.9 + sprintModifier: 0.9 - type: entity parent: ClothingShoesBaseButcherable diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index ea7b4ea0aab..8112d0a307d 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -393,7 +393,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtLibrarian name: librarian jumpskirt - description: A cosy green jumper fit for a curator of books. + description: A cosy red jumper fit for a curator of books. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/librarian.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index a7135305150..568307f3c63 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -137,8 +137,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomOfficial - name: CentCom official's jumpsuit - description: It's a jumpsuit worn by CentCom's officials. + name: CentCom officer's suit # Corvax-Resprite + description: It's a suit worn by CentCom's highest-tier Commanders. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/centcom_official.rsi @@ -148,8 +148,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitCentcomOfficer - name: CentCom officer's jumpsuit - description: It's a jumpsuit worn by CentCom Officers. + name: CentCom turtleneck suit # Corvax-Resprite + description: A casual, yet refined green turtleneck, used by CentCom Officials. It has a fragrance of aloe. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi @@ -636,8 +636,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitLibrarian - name: librarian jumpsuit - description: A cosy green jumper fit for a curator of books. + name: sensible suit # Corvax-Resprite + description: It's very... sensible. # Corvax-Resprite components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/librarian.rsi @@ -828,7 +828,7 @@ parent: UnsensoredClothingUniformBase id: ClothingUniformJumpsuitNinja name: ninja jumpsuit - description: Comfortable ninja suit, for convenience when relaxing and when you need to practice. + description: A nano-enhanced jumpsuit designed for maximum comfort and tacticality. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/ninja.rsi @@ -926,8 +926,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitMusician - name: musician's tuxedo - description: A fancy tuxedo for the musically inclined. Perfect for any lounge act! + name: carpskin suit # Corvax-Resprite + description: An luxurious suit made with only the finest scales, perfect for any lounge act! # Corvax-Resprite components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/musician.rsi diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 7d7d9697d2c..32e1848d933 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -45,6 +45,17 @@ - ClothingNeckNonBinaryPin - ClothingNeckPansexualPin - ClothingNeckTransPin + # Corvax-Pins-Start + - ClothingNeckUSSPPin + - ClothingNeckDonkPin + - ClothingNeckEarthPin + - ClothingNeckLogistikaPin + - ClothingNeckDeForestPin + - ClothingNeckNakamuraPin + - ClothingNeckNanoTrasenPin + - ClothingNeckSyndicakePin + - ClothingNeckVitezstviPin + # Corvax-Pins-End - CluwneHorn - ClothingMaskRat - MysteryFigureBox diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 4dcc97ad316..b7460c7bd1b 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -83,6 +83,7 @@ - PosterContrabandBeachStarYamamoto - PosterContrabandHighEffectEngineering - PosterContrabandNuclearDeviceInformational + - PosterLegitEnlist # Corvax-Lore - PosterContrabandRevolt - PosterContrabandRise - PosterContrabandMoth @@ -135,7 +136,6 @@ - PosterLegit50thAnniversaryVintageReprint - PosterLegitFruitBowl - PosterLegitPDAAd - - PosterLegitEnlist - PosterLegitNanomichiAd - PosterLegit12Gauge - PosterLegitHighClassMartini diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml index a61af1467bf..d4ecb343d4b 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/pottedplants.yml @@ -11,6 +11,13 @@ - type: RandomSpawner offset: 0 prototypes: + # Corvax-Resprite-Start + - PottedPlantAlt0 + - PottedPlantAlt1 + - PottedPlantAlt2 + - PottedPlantAlt3 + - PottedPlantAlt4 + # Corvax-Resprite-End - PottedPlant0 - PottedPlant1 - PottedPlant2 diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 7ad8c619568..64c8ee404e9 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -239,7 +239,7 @@ name: lawyer components: - type: SpawnPoint - job_id: Lawyer + job_id: IAA # Corvax-IAA: Lawyer replaced with IAA - type: Sprite layers: - state: green diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml index de88a17fd77..eb51a4b2e12 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cat_parts.yml @@ -3,6 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop speciesRestriction: [Human] + sponsorOnly: true # Sunrise-Sponsors coloring: default: type: @@ -26,6 +27,7 @@ bodyPart: Tail markingCategory: Tail speciesRestriction: [Human] + sponsorOnly: true # Sunrise-Sponsors coloring: default: type: @@ -37,4 +39,4 @@ - !type:SkinColoring sprites: - sprite: Mobs/Customization/cat_parts.rsi - state: tail_cat + state: tail_cat_wag # Sunrise-Sponsors diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/cyberlibs.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cyberlibs.yml new file mode 100644 index 00000000000..513230a1694 --- /dev/null +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/cyberlibs.yml @@ -0,0 +1,1105 @@ +# Bishop +- type: marking + id: CyberlimbRArmBishop + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: r_arm + +- type: marking + id: CyberlimbLArmBishop + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: l_arm + +- type: marking + id: CyberlimbRHandBishop + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: r_hand + +- type: marking + id: CyberlimbLHandBishop + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: l_hand + +- type: marking + id: CyberlimbRLegBishop + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: r_leg + +- type: marking + id: CyberlimbLLegBishop + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: l_leg + +- type: marking + id: CyberlimbLFootBishop + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: l_foot + +- type: marking + id: CyberlimbRFootBishop + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: r_foot + +- type: marking + id: CyberlimbTorsoBishop + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/bishop.rsi + state: torso + +# Hephaestus +- type: marking + id: CyberlimbRArmHephaestus + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: r_arm + +- type: marking + id: CyberlimbLArmHephaestus + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: l_arm + +- type: marking + id: CyberlimbRHandHephaestus + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: r_hand + +- type: marking + id: CyberlimbLHandHephaestus + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: l_hand + +- type: marking + id: CyberlimbRLegHephaestus + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: r_leg + +- type: marking + id: CyberlimbLLegHephaestus + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: l_leg + +- type: marking + id: CyberlimbLFootHephaestus + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: l_foot + +- type: marking + id: CyberlimbRFootHephaestus + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: r_foot + +- type: marking + id: CyberlimbTorsoHephaestus + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus.rsi + state: torso + +# Hephaestus Titan +- type: marking + id: CyberlimbRArmHephaestusTitan + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: r_arm + +- type: marking + id: CyberlimbLArmHephaestusTitan + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: l_arm + +- type: marking + id: CyberlimbRHandHephaestusTitan + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: r_hand + +- type: marking + id: CyberlimbLHandHephaestusTitan + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: l_hand + +- type: marking + id: CyberlimbRLegHephaestusTitan + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: r_leg + +- type: marking + id: CyberlimbLLegHephaestusTitan + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: l_leg + +- type: marking + id: CyberlimbLFootHephaestusTitan + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: l_foot + +- type: marking + id: CyberlimbRFootHephaestusTitan + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: r_foot + +- type: marking + id: CyberlimbTorsoHephaestusTitan + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/hephaestus_titan.rsi + state: torso + +# Morpheus +- type: marking + id: CyberlimbRArmMorpheus + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: r_arm + +- type: marking + id: CyberlimbLArmMorpheus + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: l_arm + +- type: marking + id: CyberlimbRHandMorpheus + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: r_hand + +- type: marking + id: CyberlimbLHandMorpheus + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: l_hand + +- type: marking + id: CyberlimbRLegMorpheus + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: r_leg + +- type: marking + id: CyberlimbLLegMorpheus + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: l_leg + +- type: marking + id: CyberlimbLFootMorpheus + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: l_foot + +- type: marking + id: CyberlimbRFootMorpheus + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: r_foot + +- type: marking + id: CyberlimbTorsoMorpheus + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/morpheus.rsi + state: torso + + +# Wardtakahashi +- type: marking + id: CyberlimbRArmWardtakahashi + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: r_arm + +- type: marking + id: CyberlimbLArmWardtakahashi + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: l_arm + +- type: marking + id: CyberlimbRHandWardtakahashi + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: r_hand + +- type: marking + id: CyberlimbLHandWardtakahashi + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: l_hand + +- type: marking + id: CyberlimbRLegWardtakahashi + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: r_leg + +- type: marking + id: CyberlimbLLegWardtakahashi + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: l_leg + +- type: marking + id: CyberlimbLFootWardtakahashi + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: l_foot + +- type: marking + id: CyberlimbRFootWardtakahashi + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: r_foot + +- type: marking + id: CyberlimbTorsoWardtakahashiMale + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sexRestriction: Male + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: torso_m + +- type: marking + id: CyberlimbTorsoWardtakahashiFemale + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sexRestriction: Female + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/wardtakahashi.rsi + state: torso_f + +# Zenghu +- type: marking + id: CyberlimbRArmZenghu + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: r_arm + +- type: marking + id: CyberlimbLArmZenghu + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: l_arm + +- type: marking + id: CyberlimbRHandZenghu + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: r_hand + +- type: marking + id: CyberlimbLHandZenghu + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: l_hand + +- type: marking + id: CyberlimbRLegZenghu + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: r_leg + +- type: marking + id: CyberlimbLLegZenghu + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: l_leg + +- type: marking + id: CyberlimbLFootZenghu + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: l_foot + +- type: marking + id: CyberlimbRFootZenghu + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: r_foot + +- type: marking + id: CyberlimbTorsoZenghu + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/zenghu.rsi + state: torso + +# Nanotrasen +- type: marking + id: CyberlimbRArmNanotrasen + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: r_arm + +- type: marking + id: CyberlimbLArmNanotrasen + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: l_arm + +- type: marking + id: CyberlimbRHandNanotrasen + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: r_hand + +- type: marking + id: CyberlimbLHandNanotrasen + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: l_hand + +- type: marking + id: CyberlimbRLegNanotrasen + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: r_leg + +- type: marking + id: CyberlimbLLegNanotrasen + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: l_leg + +- type: marking + id: CyberlimbLFootNanotrasen + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: l_foot + +- type: marking + id: CyberlimbRFootNanotrasen + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: r_foot + +- type: marking + id: CyberlimbTorsoNanotrasen + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: torso + +# Xion +- type: marking + id: CyberlimbRArmXion + bodyPart: RArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: r_arm + +- type: marking + id: CyberlimbLArmXion + bodyPart: LArm + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: l_arm + +- type: marking + id: CyberlimbRHandXion + bodyPart: RHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: r_hand + +- type: marking + id: CyberlimbLHandXion + bodyPart: LHand + markingCategory: Arms + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: l_hand + +- type: marking + id: CyberlimbRLegXion + bodyPart: RLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: r_leg + +- type: marking + id: CyberlimbLLegXion + bodyPart: LLeg + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: l_leg + +- type: marking + id: CyberlimbLFootXion + bodyPart: LFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: l_foot + +- type: marking + id: CyberlimbRFootXion + bodyPart: RFoot + markingCategory: Legs + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: r_foot + +- type: marking + id: CyberlimbTorsoXion + bodyPart: Chest + markingCategory: Chest + speciesRestriction: [ Human, Dwarf, Arachnid ] + sponsorOnly: true + coloring: + default: + type: + !type:SimpleColoring + color: "#FFFFFF" + sprites: + - sprite: Corvax/Mobs/Customization/Cyberlimbs/xion.rsi + state: torso diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 187aeae2650..2d0677b681d 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -97,8 +97,12 @@ - Science - type: ZombieImmune - type: Repairable - doAfterDelay: 10 - allowSelfRepair: false + doAfterDelay: 3 + damage: + types: + Blunt: -15 + Slash: -15 + Piercing: -15 - type: BorgChassis - type: WiresPanel - type: ActivatableUIRequiresPanel @@ -216,6 +220,8 @@ guides: - Cyborgs - type: StepTriggerImmune +# - type: TTS +# voice: TODO add our TTS Voice Sunrise - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml index 9f8eab968e8..7bad3bd09c9 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/borg_chassis.yml @@ -248,6 +248,8 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepHoverBorg + - type: TTS + voice: FastCore - type: entity id: BorgChassisService diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 23eb462db18..9c752e8bc45 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -759,6 +759,8 @@ attributes: proper: true gender: female + - type: TTS + voice: Neco - type: entity name: Pun Pun diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml index 8a56a399163..1da3ea8a5b0 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/revenant.yml @@ -40,6 +40,8 @@ - type: Examiner - type: NoSlip - type: Actions + - type: TTS + voice: HermaeusMora - type: Eye drawFov: false visMask: @@ -88,9 +90,9 @@ - StolenEssence - type: RandomMetadata nameSegments: - - The +# - The - RevenantType - - of +# - of - RevenantAdjective - RevenantTheme - type: Speech diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 3c61306e041..43a97a3bc8e 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -107,6 +107,8 @@ proto: robot - type: ZombieImmune - type: StepTriggerImmune + - type: TTS + voice: FactCore # Sunrise-TTS - type: entity parent: MobSiliconBase diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index d2ca7804381..362c1fe97c3 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -141,6 +141,8 @@ - type: HTN rootTask: task: SimpleHostileCompound + - type: TTS + voice: Tracer - type: entity name: geras diff --git a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml index 8171ec0053c..3d9814be68c 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml @@ -98,8 +98,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Corvax/Interface/AdminActions/solar.png # Corvax-Resprite + iconOn: Corvax/Interface/AdminActions/solar.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.SolarControlConsoleUiKey.Key } @@ -111,8 +111,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Corvax/Interface/AdminActions/communications.png # Corvax-Resprite + iconOn: Corvax/Interface/AdminActions/communications.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.CommunicationsConsoleUiKey.Key } @@ -124,8 +124,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Corvax/Interface/AdminActions/radar.png # Corvax-Resprite + iconOn: Corvax/Interface/AdminActions/radar.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.RadarConsoleUiKey.Key } @@ -137,8 +137,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Corvax/Interface/AdminActions/cargo.png # Corvax-Resprite + iconOn: Corvax/Interface/AdminActions/cargo.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.CargoConsoleUiKey.Orders } @@ -150,8 +150,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Corvax/Interface/AdminActions/monitoring.png # Corvax-Resprite + iconOn: Corvax/Interface/AdminActions/monitoring.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.CrewMonitoringUIKey.Key } @@ -163,8 +163,8 @@ noSpawn: true components: - type: InstantAction - icon: { sprite: Structures/Machines/parts.rsi, state: box_0 } - iconOn: Structures/Machines/parts.rsi/box_2.png + icon: Corvax/Interface/AdminActions/records.png # Corvax-Resprite + iconOn: Corvax/Interface/AdminActions/records.png # Corvax-Resprite keywords: [ "AI", "console", "interface" ] priority: -10 event: !type:ToggleIntrinsicUIEvent { key: enum.GeneralStationRecordConsoleKey.Key } diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index 2c7ad4972c0..6962841a4db 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -14,7 +14,9 @@ - type: Loadout prototypes: [SyndicateOperativeGearExtremelyBasic] - type: RandomMetadata - nameSegments: [names_death_commando] + nameSegments: # Corvax-MRP + - names_first_male + - names_last_male - type: NpcFactionMember factions: - Syndicate diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index c5805f0ed92..24e813bceae 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -21,6 +21,8 @@ - type: randomHumanoidSettings id: DeathSquad randomizeName: false + speciesBlacklist: # Corvax-MRP + - Diona components: - type: MindShield - type: GhostRole @@ -339,6 +341,8 @@ - type: randomHumanoidSettings id: ERTSecurity + speciesBlacklist: # Corvax-MRP + - Diona parent: ERTLeader components: - type: MindShield @@ -485,6 +489,8 @@ - type: InitialInfectedExempt - type: randomHumanoidSettings + speciesBlacklist: # Corvax-MRP + - Diona id: CBURNAgent components: - type: MindShield @@ -538,7 +544,7 @@ sprite: Mobs/Species/Human/parts.rsi state: full - type: RandomMetadata - nameSegments: [ names_death_commando ] + nameSegments: [ ru_names_death_commando ] # Sunrise-edit - type: RandomHumanoidSpawner settings: SyndicateAgent diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml index 1cac380cd03..028530906f3 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/diona.yml @@ -93,6 +93,7 @@ Unsexed: UnisexDiona - type: BodyEmotes soundsId: DionaBodyEmotes + - type: Pacified # Corvax-DionaPacifist - type: IgnoreKudzu - type: IgniteOnHeatDamage fireStacks: 1 diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml index 0a2b68d0a1d..0e2e8a9b14d 100644 --- a/Resources/Prototypes/Entities/Mobs/base.yml +++ b/Resources/Prototypes/Entities/Mobs/base.yml @@ -43,6 +43,7 @@ - type: MovementSpeedModifier - type: Polymorphable - type: StatusIcon + - type: TTS # Corvax-TTS # Used for mobs that have health and can take damage. - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Decoration/containers.yml b/Resources/Prototypes/Entities/Objects/Decoration/containers.yml new file mode 100644 index 00000000000..80098305d54 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Decoration/containers.yml @@ -0,0 +1,157 @@ +- type: entity + id: BaseShippingContainer + abstract: true + placement: + mode: SnapgridCenter + components: + - type: SpriteFade + - type: Clickable + - type: Sprite + sprite: Corvax/Objects/Decoration/containers.rsi + netsync: false + drawdepth: Overdoors + - type: Physics + bodyType: Static + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-1.5,0,1.5,-1" + density: 1000 + layer: + - WallLayer + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 500 + behaviors: + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel: + min: 10 + max: 20 + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + id: ShippingContainerBlank + parent: BaseShippingContainer + name: shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is blank, offering no clue as to its contents. + components: + - type: Sprite + state: container_blank + +- type: entity + id: ShippingContainerConarex + parent: BaseShippingContainer + name: Conarex Aeronautics shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from Conarex Aeronautics, and is probably carrying spacecraft parts (or a bribery scandal) as a result. + components: + - type: Sprite + state: conarex + +- type: entity + id: ShippingContainerDeforest + parent: BaseShippingContainer + name: DeForest Medical Corp. shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from DeForest, and so is probably carrying medical supplies. + components: + - type: Sprite + state: deforest + +- type: entity + id: ShippingContainerKahraman + parent: BaseShippingContainer + name: Kahraman Heavy Industry shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from Kahraman, and is reinforced for carrying ore. + components: + - type: Sprite + state: kahraman + +- type: entity + id: ShippingContainerKosmologistika + parent: BaseShippingContainer + name: Kosmologistika shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from Kosmologistika, the logistics company owned and operated by the SSC. + components: + - type: Sprite + state: kosmologistika + +- type: entity + id: ShippingContainerInterdyne + parent: BaseShippingContainer + name: Interdyne shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from Interdyne, a private pharmaceutical company. Probably carrying medical or research supplies, probably. + components: + - type: Sprite + state: interdyne + +- type: entity + id: ShippingContainerNakamura + parent: BaseShippingContainer + name: Nakamura Engineering shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from Nakamura, presumably for transporting tools or heavy industrial equipment. + components: + - type: Sprite + state: nakamura + +- type: entity + id: ShippingContainerNanotrasen + parent: BaseShippingContainer + name: Nanotrasen shipping container + description: A standard-measure shipping container for bulk transport of goods. This one prominently features Nanotrasen's logo, and so presumably could be carrying anything. + components: + - type: Sprite + state: nthi + +- type: entity + id: ShippingContainerVitezstvi + parent: BaseShippingContainer + name: Vítězství Arms shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from Vítězství Arms, proudly proclaiming that Vítězství weapons mean victory. + components: + - type: Sprite + state: vitezstvi + +- type: entity + id: ShippingContainerCybersun + parent: BaseShippingContainer + name: Cybersun Industries shipping container + description: A standard-measure shipping container for bulk transport of goods. This one prominently features Cybersun's logo, and so presumably could be carrying almost anything. + components: + - type: Sprite + state: cybersun + +- type: entity + id: ShippingContainerDonkCo + parent: BaseShippingContainer + name: Donk Co. shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from Donk Co. and so could be carrying just about anything- although it's probably Donk Pockets. + components: + - type: Sprite + state: donk_co + +- type: entity + id: ShippingContainerGorlex + parent: BaseShippingContainer + name: Gorlex Securities shipping container + description: A standard-measure shipping container for bulk transport of goods. This one is from Gorlex Securities, and is probably carrying their primary export - war crimes. + components: + - type: Sprite + state: gorlex + +- type: entity + id: ShippingContainerGorlexRed + parent: ShippingContainerGorlex + components: + - type: Sprite + state: gorlex_red diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index c62783fcee9..802534b0f34 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -17,7 +17,7 @@ - type: GhostRoleMobSpawner prototype: MobHumanSyndicateAgent - type: EmitSoundOnUse - sound: /Audio/Effects/Emotes/parp1.ogg + sound: /Audio/Misc/emergency_meeting.ogg - type: UseDelay delay: 300 @@ -45,6 +45,7 @@ prototype: MobMonkeySyndicateAgent selectablePrototypes: ["SyndicateMonkey", "SyndicateKobold"] + - type: entity parent: ReinforcementRadioSyndicateAncestor id: ReinforcementRadioSyndicateAncestorNukeops # Reinforcement radio exclusive to nukeops uplink diff --git a/Resources/Prototypes/Entities/Objects/Fun/pai.yml b/Resources/Prototypes/Entities/Objects/Fun/pai.yml index 1b9c5303c6b..028d58057c3 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/pai.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/pai.yml @@ -54,6 +54,8 @@ - type: Actions - type: TypingIndicator proto: robot +# - type: TTS +# voice: TODO add our TTS Voice Sunrise - type: Speech speechVerb: Robotic speechSounds: Pai diff --git a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml index 01a15d2e5bd..c260d902707 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/puppet.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/puppet.yml @@ -18,6 +18,8 @@ - type: Muted - type: TypingIndicator proto: robot + - type: TTS + voice: Kleiner - type: Actions - type: MobState allowedStates: @@ -40,3 +42,5 @@ sprite: Objects/Fun/mrdips.rsi layers: - state: icon + - type: TTS + voice: Sheogorath diff --git a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml index a02f94215b8..3f892d924e4 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/fluff_lights.yml @@ -80,6 +80,7 @@ festive: { state: christmaslamp } light: festive: { state: christmaslamp-on } + - type: Rotatable # Corvax-Resprite - type: entity name: banana lamp @@ -94,6 +95,7 @@ shader: unshaded visible: false map: [ "light" ] + - type: Rotatable - type: entity name: desk lamp @@ -127,6 +129,7 @@ festive: sprite: Objects/Misc/Lights/lamp.rsi state: christmaslamp-on + - type: Rotatable # Corvax-Resprite - type: entity name: interrogator lamp diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index c09deb13071..9ab3f356acd 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -99,9 +99,11 @@ abstract: true components: - type: Item - sprite: Objects/Specific/Medical/syndi_implanter.rsi + #sprite: Objects/Specific/Medical/syndi_implanter.rsi + sprite: Objects/Specific/Medical/implanter.rsi #Corvax MRP anti-meta - type: Sprite - sprite: Objects/Specific/Medical/syndi_implanter.rsi + #sprite: Objects/Specific/Medical/syndi_implanter.rsi + sprite: Objects/Specific/Medical/implanter.rsi #Corvax MRP anti-meta state: implanter1 layers: - state: implanter0 diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 05a0b9d3455..ba9663cd807 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -71,6 +71,12 @@ reagents: - ReagentId: Fiber Quantity: 1 +# Corvax-Printer-Start + - type: Material + - type: PhysicalComposition + materialComposition: + SheetPrinter: 100 +# Corvax-Printer-End - type: entity name: paper scrap diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index 975a554d525..0d84b577802 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -243,7 +243,7 @@ - type: Stamp stampedName: stamp-component-stamped-name-approved stampedColor: "#00be00" - stampState: "paper_stamp-ok" + stampState: "paper_stamp-approve" # Corvax-IAA: paper_stamp-ok state is IAA! - type: Sprite state: stamp-ok diff --git a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml index c26ba925e0d..01db0707358 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml @@ -35,7 +35,7 @@ - ReagentId: THC Quantity: 12 - type: Sprite - sprite: Objects/Specific/Hydroponics/tobacco.rsi + sprite: Objects/Specific/Hydroponics/cannabis.rsi # Corvax-Resprite: Fix path state: dried - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml index c489dec1c56..0732ddad7ed 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mecha_equipment.yml @@ -65,6 +65,7 @@ - collection: TrollAnimals - collection: TrollBeeping - collection: TrollEsword + - collection: TrollMeeting - type: UIFragment ui: !type:MechSoundboardUi - type: UseDelay diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml index c01aaa84a9d..232bc147b47 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healthanalyzer.yml @@ -24,6 +24,8 @@ - type: HealthAnalyzer scanningEndSound: path: "/Audio/Items/Medical/healthscanner.ogg" + damageContainers: + - Biological - type: Tag tags: - DiscreteHealthAnalyzer diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index d6f3ee75fa6..3872c9f0d0c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -423,9 +423,11 @@ maxVol: 10 - type: RefillableSolution solution: hypospray - - type: ExaminableSolution - solution: hypospray - heldOnly: true # Allow examination only when held in hand. +# Corvax-HiddenDesc-Start + #- type: ExaminableSolution + # solution: hypospray + # heldOnly: true # Allow examination only when held in hand. +# Corvax-HiddenDesc-End - type: Hypospray onlyAffectsMobs: false - type: UseDelay diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml index 308c013da46..083ba7ebd0c 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/mmi.yml @@ -69,6 +69,8 @@ name: positronic brain description: An artificial brain capable of spontaneous neural activity. components: + - type: Organ # Sunrise-Edit + - type: Brain # Sunrise-Edit - type: Sprite sprite: Objects/Specific/Robotics/mmi.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml index 4bd71f898db..969a974ecab 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml @@ -79,7 +79,7 @@ - !type:DoActsBehavior acts: [ "Destruction" ] - type: Label - originalName: jug + originalName: кувшин # Corvax-Localization - type: Tag tags: - ChemDispensable diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index 3f72fa10fad..3f3da1df114 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -196,6 +196,16 @@ Quantity: 3 - ReagentId: Copper Quantity: 2 + - type: Healing + delay: 1 + damageContainers: + - Synth + - Silicon + damage: + types: + Heat: -5 + Shock: -5 + Caustic: -5 - type: entity parent: CableApcStack diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml index 5b0b16bf4bc..a6deb4f65ac 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/shotgun.yml @@ -14,7 +14,7 @@ - ShellShotgun capacity: 8 soundRack: - path: /Audio/Weapons/Guns/Cock/smg_cock.ogg + path: /Audio/Corvax/Weapons/Guns/Cock/shotgun_cock.ogg # Corvax-Guns - type: Item size: Small - type: ContainerContainer diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index a19ed1951e4..7bcd5b496fc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -73,7 +73,7 @@ availableModes: - FullAuto soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + path: /Audio/Corvax/Weapons/Guns/Gunshots/shotgun_auto.ogg # Corvax-Guns soundEmpty: path: /Audio/Weapons/Guns/Empty/empty.ogg - type: ItemSlots @@ -147,6 +147,9 @@ sprite: Objects/Weapons/Guns/Shotguns/enforcer_inhands_64x.rsi - type: BallisticAmmoProvider - type: GunRequiresWield #remove when inaccuracy on spreads is fixed + - type: Gun # Corvax-Guns + soundGunshot: + path: /Audio/Corvax/Weapons/Guns/Gunshots/shotgun_metal.ogg - type: entity parent: WeaponShotgunEnforcer @@ -155,6 +158,9 @@ components: - type: BallisticAmmoProvider proto: ShellShotgunBeanbag + - type: Gun # Corvax-Guns + soundGunshot: + path: /Audio/Corvax/Weapons/Guns/Gunshots/shotgun_metal.ogg - type: entity name: Kammerer @@ -177,6 +183,9 @@ - type: Tag tags: - WeaponShotgunKammerer + - type: Gun # Corvax-Guns + soundGunshot: + path: /Audio/Corvax/Weapons/Guns/Gunshots/shotgun_alt.ogg - type: entity name: sawn-off shotgun @@ -193,6 +202,8 @@ sprite: Objects/Weapons/Guns/Shotguns/sawn_inhands_64x.rsi - type: Gun fireRate: 4 + soundGunshot: # Corvax-Guns + path: /Audio/Corvax/Weapons/Guns/Gunshots/shotgun_sawed.ogg - type: BallisticAmmoProvider capacity: 2 - type: Construction @@ -229,6 +240,8 @@ sprite: Objects/Weapons/Guns/Shotguns/hm_pistol.rsi - type: Gun fireRate: 4 + soundGunshot: # Corvax-Guns + path: /Audio/Corvax/Weapons/Guns/Gunshots/shotgun_pipe.ogg - type: BallisticAmmoProvider capacity: 1 - type: Construction diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 74a42c07742..a27bff3aeff 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -107,7 +107,7 @@ - type: Item size: Normal - type: Tag - tags: + tags: - Truncheon - type: Clothing sprite: Objects/Weapons/Melee/truncheon.rsi @@ -129,6 +129,7 @@ id: Flash description: An ultrabright flashbulb with a trigger, which causes the victim to be dazed and lose their eyesight for a moment. Useless when burnt out. components: + - type: Organ # Sunrise-edit - type: Sprite sprite: Objects/Weapons/Melee/flash.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml index 39bb8c3a2aa..ffa55cb7c56 100644 --- a/Resources/Prototypes/Entities/Objects/base_item.yml +++ b/Resources/Prototypes/Entities/Objects/base_item.yml @@ -42,6 +42,8 @@ noRot: false - type: Pullable - type: DamageExaminable + - type: TTS + voice: FactCore # Sunrise-TTS - type: entity name: "storage item" diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index 86657eb46e0..3df2b6694dc 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml @@ -67,6 +67,7 @@ fuel: 5 time: 3 - type: Airlock + openUnlitVisible: true # Corvax-Resprite-Airlocks - type: NavMapDoor - type: DoorBolt - type: Appearance diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml index 559dca704cd..d02f307abb5 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml @@ -58,6 +58,7 @@ fuel: 10 time: 10 - type: Airlock + openUnlitVisible: true # Corvax-Resprite-Airlocks - type: NavMapDoor - type: DoorBolt - type: AccessReader diff --git a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml index 53d268facf4..19465ba65d0 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/potted_plants.yml @@ -230,7 +230,7 @@ id: PottedPlantRD #PottedPlant25 parent: PottedPlantBase name: "RD's potted plant" - description: "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\"\nIt doesn't look very healthy..." + description: "A gift from the botanical staff, presented after the RD's reassignment. There's a tag on it that says \"Y'all come back now, y'hear?\" It doesn't look very healthy..." # Corvax-Localization: Remove newline components: - type: Sprite state: plant-25 diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml index 08e3173334b..bc1b681d865 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/frame.yml @@ -40,6 +40,8 @@ node: monitorBroken - !type:DoActsBehavior acts: ["Destruction"] + - type: TTS + voice: FactCore # Sunrise-TTS - type: entity id: ComputerFrame diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml index 36be6451d20..0eceaa1bb4d 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml @@ -82,6 +82,7 @@ - type: FaxMachine name: "Central Command" notifyAdmins: true + receiveStationGoal: true # Sunrise-StationGoal - type: entity parent: FaxMachineBase @@ -109,5 +110,6 @@ - type: FaxMachine name: "Captain's Office" receiveNukeCodes: true + receiveStationGoal: true # Sunrise-StationGoal - type: StealTarget stealGroup: FaxMachineCaptain diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 575144a2c22..086fc102170 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -207,7 +207,7 @@ - MagazineBoxRifle - MagazineLightRifle - MagazineLightRifleEmpty - - MagazinePistol + - MagazinePistol - MagazinePistolEmpty - MagazinePistolSubMachineGun - MagazinePistolSubMachineGunEmpty @@ -267,6 +267,8 @@ - LargeBeaker - Dropper - ClothingEyesGlassesChemical + - Nanopaste # Sunrise-edit + - HandheldRoboAnalyzer # Sunrise-edit dynamicRecipes: - PowerDrill - MiningDrill @@ -417,6 +419,7 @@ - ChemMasterMachineCircuitboard - CondenserMachineCircuitBoard - HotplateMachineCircuitboard + - PrinterDocMachineCircuitboard # Corvax-Printer - UniformPrinterMachineCircuitboard - FloorGreenCircuit - FloorBlueCircuit @@ -705,7 +708,7 @@ staticRecipes: - BoxLethalshot - BoxShotgunFlare - - BoxShotgunPractice + - BoxShotgunPractice - BoxShotgunSlug - ClothingEyesHudSecurity - Flash @@ -721,7 +724,7 @@ - MagazineBoxRiflePractice - MagazineLightRifle - MagazineLightRifleEmpty - - MagazinePistol + - MagazinePistol - MagazinePistolEmpty - MagazinePistolSubMachineGun - MagazinePistolSubMachineGunEmpty @@ -833,8 +836,8 @@ - MagazineBoxRifle - MagazineLightRifle - MagazineLightRifleEmpty - - MagazinePistol - - MagazinePistolEmpty + - MagazinePistol + - MagazinePistolEmpty - MagazineRifle - MagazineRifleEmpty - MagazineShotgun @@ -1054,6 +1057,7 @@ - ClothingNeckMantleCMO - ClothingNeckMantleHOP - ClothingNeckMantleHOS + - ClothingNeckMantleHOSShoulder # Corvax-Resprite: Old mantle - ClothingNeckMantleRD - ClothingNeckMantleQM - ClothingOuterWinterMusician diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 16a5aa55d4e..afa3fd2d177 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -71,6 +71,8 @@ - type: Anchorable - type: TypingIndicator proto: robot + - type: TTS + voice: FactCore - type: Speech speechVerb: Robotic speechSounds: Vending @@ -152,7 +154,7 @@ pack: GenericVendGoodbyes - type: Speech - type: Sprite - sprite: Structures/Machines/VendingMachines/ammo.rsi + sprite: Corvax/Structures/Machines/VendingMachines/ammo.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml index b999b2bdede..3849f06927a 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/emitter.yml @@ -26,14 +26,14 @@ - type: Sprite sprite: Structures/Power/Generation/Singularity/emitter.rsi layers: - - state: emitter2 + - state: emitter # Corvax-Resprite - state: beam shader: unshaded visible: false map: ["enum.EmitterVisualLayers.Lights"] - - state: locked + - state: unlocked # Corvax-Resprite shader: unshaded - visible: false + # visible: false # Corvax-Resprite map: ["enum.LockVisualLayers.Lock"] - type: Emitter - type: Gun diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml index ac7f053b631..45dae1847d2 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Closets/big_boxes.yml @@ -107,4 +107,4 @@ - type: EntityStorage isCollidableWhenOpen: false openOnMove: false - airtight: false \ No newline at end of file + airtight: false diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index 934298b6207..30cfeeefaba 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -24,12 +24,12 @@ solution: tank - type: ReagentTank tankType: Fuel - - type: DamageOnToolInteract - tools: - - Welding - weldingDamage: - types: - Heat: 10 +# - type: DamageOnToolInteract +# tools: +# - Welding +# weldingDamage: +# types: +# Heat: 10 - type: PacifismDangerousAttack - type: Explosive explosionType: Default @@ -208,13 +208,13 @@ sprite: Structures/Storage/tanks.rsi layers: - state: generictank-1 - - state: watertank-2-1 + - state: generictank-1-1 # Corvax-Resprite map: ["enum.SolutionContainerLayers.Fill"] visible: false - type: Appearance - type: SolutionContainerVisuals maxFillLevels: 5 - fillBaseName: watertank-2- + fillBaseName: generictank-1- # Corvax-Resprite - type: ExaminableSolution solution: tank diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index 7f306bbf946..89fd4d4809b 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml @@ -44,8 +44,8 @@ layerMap: "airAlarmBase" alarmStates: Normal: alarm0 - Warning: alarm2 - Danger: alarm1 + Warning: alarm1 # Corvax-Resprite + Danger: alarm2 # Corvax-Resprite setOnDepowered: airAlarmBase: alarmp - type: Tag diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml index 82d11b732b6..a43777fe1af 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml @@ -66,7 +66,7 @@ state: state0 - type: IconSmooth mode: Diagonal - key: windows + key: walls #corvax smooth base: state - type: Icon sprite: Structures/Windows/mining_diagonal.rsi diff --git a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml index 36a12f2d844..cbca69160f4 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plasma.yml @@ -113,7 +113,7 @@ state: state0 - type: IconSmooth mode: Diagonal - key: windows + key: walls # Corvax-Resprite base: state - type: Icon sprite: Structures/Windows/plasma_diagonal.rsi diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml index d8b6c7d11d8..da61458421b 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -150,7 +150,7 @@ state: state0 - type: IconSmooth mode: Diagonal - key: windows + key: walls # Corvax-Resprite base: state - type: Icon sprite: Structures/Windows/reinforced_window_diagonal.rsi diff --git a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml index 93859b1db2c..0841389d42d 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/rplasma.yml @@ -125,7 +125,7 @@ state: state0 - type: IconSmooth mode: Diagonal - key: windows + key: walls # Corvax-Resprite base: state - type: Icon sprite: Structures/Windows/reinforced_plasma_diagonal.rsi diff --git a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml index e26fec65b77..686709dcf6c 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/ruranium.yml @@ -116,7 +116,7 @@ state: state0 - type: IconSmooth mode: Diagonal - key: windows + key: walls # Corvax-Resprite base: state - type: Icon sprite: Structures/Windows/reinforced_uranium_diagonal.rsi diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml index f1b840c1435..08a0e2abda1 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml @@ -69,7 +69,7 @@ state: state0 - type: IconSmooth mode: Diagonal - key: windows + key: walls # Corvax-Resprite base: state - type: Icon sprite: Structures/Windows/shuttle_window_diagonal.rsi diff --git a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml index e5228bc593e..41be15e820f 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/uranium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/uranium.yml @@ -111,7 +111,7 @@ state: state0 - type: IconSmooth mode: Diagonal - key: windows + key: walls # Corvax-Resprite base: state - type: Icon sprite: Structures/Windows/uranium_window_diagonal.rsi diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index 606c54e35b8..954ff4d9500 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -72,7 +72,7 @@ acts: [ "Destruction" ] - type: Airtight - type: IconSmooth - key: windows + key: walls # Corvax-Resprite base: window - type: InteractionPopup interactSuccessString: comp-window-knock @@ -236,7 +236,7 @@ state: state0 - type: IconSmooth mode: Diagonal - key: windows + key: walls # Corvax-Resprite base: state - type: Icon sprite: Structures/Windows/window_diagonal.rsi diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml index 71971a66243..1c3d5b59ede 100644 --- a/Resources/Prototypes/Entities/Structures/base_structure.yml +++ b/Resources/Prototypes/Entities/Structures/base_structure.yml @@ -25,6 +25,8 @@ - type: Tag tags: - Structure + - type: TTS + voice: FactCore # Sunrise-TTS - type: entity # This means that it's not anchored on spawn. diff --git a/Resources/Prototypes/Entities/Structures/hydro_tray.yml b/Resources/Prototypes/Entities/Structures/hydro_tray.yml index 8ea7172d8b4..bb3da38d7b2 100644 --- a/Resources/Prototypes/Entities/Structures/hydro_tray.yml +++ b/Resources/Prototypes/Entities/Structures/hydro_tray.yml @@ -80,6 +80,8 @@ acts: ["Destruction"] - type: Machine board: HydroponicsTrayMachineCircuitboard + - type: TTS + voice: FactCore - type: WiresPanel - type: AmbientSound volume: -9 diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index 3b9ad5aadf2..cfcedbe0ef1 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -7,6 +7,8 @@ weight: 8 startDelay: 30 duration: 35 + startAudio: + path: /Audio/Announcements/announce.ogg # Sunrise-edit - type: AnomalySpawnRule - type: entity @@ -18,6 +20,8 @@ weight: 8 startDelay: 30 duration: 35 + startAudio: + path: /Audio/Announcements/announce.ogg # Sunrise-edit - type: BluespaceArtifactRule - type: entity @@ -50,6 +54,8 @@ components: - type: StationEvent startAnnouncement: station-event-bureaucratic-error-announcement + startAudio: + path: /Audio/Announcements/announce.ogg # Sunrise-edit minimumPlayers: 25 weight: 3 duration: 1 @@ -62,6 +68,8 @@ components: - type: StationEvent startAnnouncement: station-event-clerical-error-announcement + startAudio: + path: /Audio/Announcements/announce.ogg # Sunrise-edit minimumPlayers: 15 weight: 5 duration: 1 @@ -138,9 +146,11 @@ - type: StationEvent startAnnouncement: station-event-gas-leak-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit endAnnouncement: station-event-gas-leak-end-announcement weight: 8 + endAudio: + path: /Audio/Announcements/announce.ogg # Sunrise-edit startDelay: 20 - type: GasLeakRule @@ -169,9 +179,9 @@ startAnnouncement: station-event-meteor-swarm-start-announcement endAnnouncement: station-event-meteor-swarm-end-announcement startAudio: - path: /Audio/Announcements/meteors.ogg - params: - volume: -4 + path: /Audio/Announcements/announce.ogg # Sunrise-edit + endAudio: + path: /Audio/Announcements/announce.ogg # Sunrise-edit duration: null #ending is handled by MeteorSwarmRule startDelay: 30 - type: MeteorSwarmRule @@ -184,7 +194,7 @@ - type: StationEvent startAnnouncement: station-event-vent-creatures-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit startDelay: 10 earliestStart: 15 weight: 6 @@ -211,7 +221,7 @@ - type: StationEvent startAnnouncement: station-event-vent-creatures-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit startDelay: 10 weight: 6 duration: 50 @@ -232,9 +242,7 @@ startAnnouncement: station-event-power-grid-check-start-announcement endAnnouncement: station-event-power-grid-check-end-announcement startAudio: - path: /Audio/Announcements/power_off.ogg - params: - volume: -4 + path: /Audio/Announcements/announce.ogg # Sunrise-edit startDelay: 24 duration: 60 maxDuration: 120 @@ -250,7 +258,7 @@ duration: 1 maxOccurrences: 1 # this event has diminishing returns on interesting-ness, so we cap it startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit - type: RandomSentienceRule - type: entity @@ -263,7 +271,7 @@ startAnnouncement: station-event-solar-flare-start-announcement endAnnouncement: station-event-solar-flare-end-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit duration: 120 maxDuration: 240 - type: SolarFlareRule @@ -290,7 +298,7 @@ - type: StationEvent startAnnouncement: station-event-vent-clog-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit earliestStart: 15 minimumPlayers: 15 weight: 5 @@ -306,7 +314,7 @@ - type: StationEvent startAnnouncement: station-event-vent-creatures-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit startDelay: 10 earliestStart: 20 minimumPlayers: 15 @@ -329,7 +337,7 @@ - type: StationEvent startAnnouncement: station-event-vent-creatures-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit startDelay: 10 earliestStart: 20 minimumPlayers: 15 @@ -348,7 +356,7 @@ - type: StationEvent startAnnouncement: station-event-vent-creatures-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-edit startDelay: 10 earliestStart: 20 minimumPlayers: 20 @@ -367,7 +375,7 @@ - type: StationEvent earliestStart: 50 minimumPlayers: 30 - weight: 2 + weight: 0 # Sunrise-edit: No-no-no duration: 1 - type: ZombieRule - type: AntagSelection @@ -439,7 +447,7 @@ maxOccurrences: 1 # can only happen once per round startAnnouncement: station-event-communication-interception startAudio: - path: /Audio/Announcements/intercept.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-TTS - type: AlertLevelInterceptionRule - type: TraitorRule - type: AntagSelection @@ -477,7 +485,7 @@ - type: StationEvent startAnnouncement: station-event-immovable-rod-start-announcement startAudio: - path: /Audio/Announcements/attention.ogg + path: /Audio/Announcements/announce.ogg # Sunrise-TTS weight: 3.5 duration: 1 earliestStart: 30 diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml index 5a4cde31018..2aef8cdb441 100644 --- a/Resources/Prototypes/GameRules/midround.yml +++ b/Resources/Prototypes/GameRules/midround.yml @@ -46,8 +46,8 @@ allowNonHumans: true multiAntagSetting: NotExclusive startingGear: ThiefGear - components: - - type: Pacified +# components: # Corvax-MRP +# - type: Pacified mindComponents: - type: ThiefRole prototype: Thief diff --git a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml index 0abba16f124..69638e991fd 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Command/head_of_personnel.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobHeadOfPersonnel - time: 54000 #15 hrs, special reward for HoP mains + time: 72000 #20 hrs, special reward for HoP mains # Corvax-RoleTime # Jumpsuit - type: loadout @@ -104,4 +104,4 @@ - type: startingGear id: HoPWintercoat equipment: - outerClothing: ClothingOuterWinterHoP \ No newline at end of file + outerClothing: ClothingOuterWinterHoP diff --git a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml index 7104598b3ae..cccdd1378b4 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Engineering/station_engineer.yml @@ -6,12 +6,12 @@ requirement: !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 21600 #6 hrs + time: 72000 #20 hrs # Corvax-RoleTime - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobStationEngineer - time: 21600 #6 hrs + time: 72000 #20 hrs # Corvax-RoleTime - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement diff --git a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml index ebad9b9f847..5a238214400 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Medical/medical_doctor.yml @@ -6,12 +6,12 @@ requirement: !type:RoleTimeRequirement role: JobChemist - time: 21600 #6 hrs + time: 72000 #20 hrs # Corvax-RoleTime - !type:JobRequirementLoadoutEffect requirement: !type:RoleTimeRequirement role: JobMedicalDoctor - time: 21600 #6 hrs + time: 72000 #20 hrs # Corvax-RoleTime - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement diff --git a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml index b2b9e1e0c12..3c646c5e528 100644 --- a/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Loadouts/Jobs/Security/security_officer.yml @@ -6,7 +6,7 @@ requirement: !type:RoleTimeRequirement role: JobWarden - time: 21600 #6 hrs + time: 72000 #20 hrs # Corvax-RoleTime - !type:JobRequirementLoadoutEffect requirement: !type:DepartmentTimeRequirement diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 5bc6fc4572b..941b9e4d4b1 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -8,6 +8,7 @@ - CaptainBackpack - CaptainOuterClothing - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobHeadOfPersonnel @@ -19,6 +20,7 @@ - HoPOuterClothing - Glasses - Trinkets + - Inventory # Corvax-Loadouts # Civilian - type: roleLoadout @@ -32,6 +34,7 @@ - PassengerShoes - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobBartender @@ -42,6 +45,7 @@ - BartenderOuterClothing - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobServiceWorker @@ -50,6 +54,7 @@ - CommonBackpack - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobChef @@ -61,6 +66,7 @@ - ChefOuterClothing - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobLibrarian @@ -69,6 +75,7 @@ - CommonBackpack - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobLawyer @@ -78,6 +85,7 @@ - LawyerBackpack - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobChaplain @@ -90,6 +98,7 @@ - ChaplainOuterClothing - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobJanitor @@ -101,6 +110,7 @@ - JanitorOuterClothing - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobBotanist @@ -111,6 +121,7 @@ - BotanistOuterClothing - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobClown @@ -122,6 +133,7 @@ - ClownShoes - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobMime @@ -133,6 +145,7 @@ - MimeOuterClothing - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobMusician @@ -141,6 +154,7 @@ - MusicianOuterClothing - Glasses - Trinkets + - Inventory # Corvax-Loadouts # Cargo - type: roleLoadout @@ -154,6 +168,7 @@ - QuartermasterShoes - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobCargoTechnician @@ -165,6 +180,7 @@ - CargoTechnicianShoes - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobSalvageSpecialist @@ -174,6 +190,7 @@ - SalvageSpecialistShoes - Glasses - Trinkets + - Inventory # Corvax-Loadouts # Engineering - type: roleLoadout @@ -186,6 +203,7 @@ - ChiefEngineerOuterClothing - ChiefEngineerShoes - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobTechnicalAssistant @@ -193,6 +211,7 @@ - TechnicalAssistantJumpsuit - StationEngineerBackpack - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobStationEngineer @@ -204,6 +223,7 @@ - StationEngineerShoes - StationEngineerID - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobAtmosphericTechnician @@ -213,6 +233,7 @@ - AtmosphericTechnicianOuterClothing - AtmosphericTechnicianShoes - Trinkets + - Inventory # Corvax-Loadouts # Science - type: roleLoadout @@ -227,6 +248,7 @@ - ResearchDirectorShoes - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobScientist @@ -241,6 +263,7 @@ - ScientistPDA - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobResearchAssistant @@ -249,6 +272,7 @@ - ScientistBackpack - Glasses - Trinkets + - Inventory # Corvax-Loadouts # Security - type: roleLoadout @@ -262,6 +286,7 @@ - HeadofSecurityOuterClothing - SecurityShoes - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobWarden @@ -273,6 +298,7 @@ - WardenOuterClothing - SecurityShoes - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobSecurityOfficer @@ -285,6 +311,7 @@ - SecurityPDA - SecurityBelt - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobDetective @@ -296,6 +323,7 @@ - DetectiveOuterClothing - SecurityShoes - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobSecurityCadet @@ -303,6 +331,7 @@ - SecurityCadetJumpsuit - SecurityBackpack - Trinkets + - Inventory # Corvax-Loadouts # Medical - type: roleLoadout @@ -318,6 +347,7 @@ - ChiefMedicalOfficerShoes - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobMedicalDoctor @@ -332,6 +362,7 @@ - MedicalDoctorPDA - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobMedicalIntern @@ -340,6 +371,7 @@ - MedicalBackpack - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobChemist @@ -351,6 +383,7 @@ - ChemistOuterClothing - MedicalShoes - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobParamedic @@ -364,6 +397,7 @@ - ParamedicShoes - Glasses - Trinkets + - Inventory # Corvax-Loadouts # Wildcards - type: roleLoadout @@ -372,6 +406,7 @@ - CommonBackpack - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobReporter @@ -380,13 +415,15 @@ - CommonBackpack - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobPsychologist groups: - - MedicalBackpack + - PsychologistBackpack # Corvax-MRP - Glasses - Trinkets + - Inventory # Corvax-Loadouts - type: roleLoadout id: JobBoxer @@ -396,3 +433,4 @@ - CommonBackpack - Glasses - Trinkets + - Inventory # Corvax-Loadouts diff --git a/Resources/Prototypes/Maps/bagel.yml b/Resources/Prototypes/Maps/bagel.yml index 24ca17339fc..ea3a642058a 100644 --- a/Resources/Prototypes/Maps/bagel.yml +++ b/Resources/Prototypes/Maps/bagel.yml @@ -21,6 +21,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] @@ -51,7 +52,7 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] + #Lawyer: [ 2, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/box.yml b/Resources/Prototypes/Maps/box.yml index 50826fc5e09..b016c53a0f9 100644 --- a/Resources/Prototypes/Maps/box.yml +++ b/Resources/Prototypes/Maps/box.yml @@ -20,6 +20,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] @@ -51,7 +52,7 @@ SecurityOfficer: [ 5, 5 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] + #Lawyer: [ 2, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/cluster.yml b/Resources/Prototypes/Maps/cluster.yml index fe445b00813..f155078bd50 100644 --- a/Resources/Prototypes/Maps/cluster.yml +++ b/Resources/Prototypes/Maps/cluster.yml @@ -1,4 +1,4 @@ -- type: gameMap +- type: gameMap id: Cluster mapName: 'Cluster' mapPath: /Maps/cluster.yml @@ -21,6 +21,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] @@ -28,7 +29,7 @@ Janitor: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] - Lawyer: [ 1, 1 ] + #Lawyer: [ 1, 1 ] # Corvax-IAA ServiceWorker: [ 1, 1 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/core.yml b/Resources/Prototypes/Maps/core.yml index 6b85aca51d3..0b0e7e968a5 100644 --- a/Resources/Prototypes/Maps/core.yml +++ b/Resources/Prototypes/Maps/core.yml @@ -27,6 +27,7 @@ Chef: [ 1, 1 ] Janitor: [ 2, 2 ] Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] @@ -51,7 +52,7 @@ HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 4, 4 ] Warden: [ 1, 1 ] - Lawyer: [ 1, 1 ] + #Lawyer: [ 1, 1 ] # Corvax-IAA SecurityCadet: [ 1, 1 ] Detective: [ 1, 1 ] #supply diff --git a/Resources/Prototypes/Maps/europa.yml b/Resources/Prototypes/Maps/europa.yml index 0c9f1d975b2..48f313fa21f 100644 --- a/Resources/Prototypes/Maps/europa.yml +++ b/Resources/Prototypes/Maps/europa.yml @@ -30,6 +30,7 @@ Chef: [ 1, 1 ] Janitor: [ 2, 2 ] Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Chaplain: [ 1, 1 ] Librarian: [ 1, 1 ] @@ -53,7 +54,7 @@ HeadOfSecurity: [ 1, 1 ] SecurityOfficer: [ 3, 3 ] Warden: [ 1, 1 ] - Lawyer: [ 1, 1 ] + #Lawyer: [ 1, 1 ] # Corvax-IAA SecurityCadet: [ 3, 3 ] Detective: [ 1, 1 ] #supply diff --git a/Resources/Prototypes/Maps/fland.yml b/Resources/Prototypes/Maps/fland.yml index f0c35f99e57..70ff5362a4c 100644 --- a/Resources/Prototypes/Maps/fland.yml +++ b/Resources/Prototypes/Maps/fland.yml @@ -22,6 +22,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 4, 4 ] @@ -52,7 +53,7 @@ SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] + #Lawyer: [ 2, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/marathon.yml b/Resources/Prototypes/Maps/marathon.yml index f82ee1d4344..f284bafeaf8 100644 --- a/Resources/Prototypes/Maps/marathon.yml +++ b/Resources/Prototypes/Maps/marathon.yml @@ -21,6 +21,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 2, 3 ] @@ -52,7 +53,7 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - Lawyer: [ 2, 2 ] + #Lawyer: [ 2, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/meta.yml b/Resources/Prototypes/Maps/meta.yml index 2bee606e95a..f7e9bb32159 100644 --- a/Resources/Prototypes/Maps/meta.yml +++ b/Resources/Prototypes/Maps/meta.yml @@ -20,6 +20,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 2, 3 ] @@ -50,7 +51,7 @@ SecurityOfficer: [ 5, 7 ] Detective: [ 1, 1 ] SecurityCadet: [ 3, 6 ] - Lawyer: [ 2, 2 ] + #Lawyer: [ 2, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] diff --git a/Resources/Prototypes/Maps/oasis.yml b/Resources/Prototypes/Maps/oasis.yml index b5e0f97190a..17b4da4867f 100644 --- a/Resources/Prototypes/Maps/oasis.yml +++ b/Resources/Prototypes/Maps/oasis.yml @@ -20,6 +20,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 4, 4 ] @@ -53,7 +54,7 @@ SecurityOfficer: [ 8, 8 ] Detective: [ 1, 1 ] SecurityCadet: [ 4, 4 ] - Lawyer: [ 3, 3 ] + # Lawyer: [ 3, 3 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 3, 3 ] @@ -62,4 +63,4 @@ Passenger: [ -1, -1 ] Clown: [ 1, 1 ] Mime: [ 1, 1 ] - Musician: [ 1, 1 ] \ No newline at end of file + Musician: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/omega.yml b/Resources/Prototypes/Maps/omega.yml index f90c5f5b658..f124e94b5c7 100644 --- a/Resources/Prototypes/Maps/omega.yml +++ b/Resources/Prototypes/Maps/omega.yml @@ -21,6 +21,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] @@ -49,7 +50,7 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] - Lawyer: [ 1, 1 ] + #Lawyer: [ 1, 1 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/origin.yml b/Resources/Prototypes/Maps/origin.yml index 12814898912..60f299f63e0 100644 --- a/Resources/Prototypes/Maps/origin.yml +++ b/Resources/Prototypes/Maps/origin.yml @@ -20,6 +20,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 2, 2 ] Botanist: [ 3, 3 ] @@ -27,7 +28,7 @@ Janitor: [ 3, 3 ] Chaplain: [ 2, 2 ] Librarian: [ 2, 2 ] - Lawyer: [ 2, 2 ] + #Lawyer: [ 2, 2 ] # Corvax-IAA ServiceWorker: [ 3, 4 ] #engineering ChiefEngineer: [ 1, 1 ] diff --git a/Resources/Prototypes/Maps/packed.yml b/Resources/Prototypes/Maps/packed.yml index 20d6c7a7bd7..8f9d3c0eb92 100644 --- a/Resources/Prototypes/Maps/packed.yml +++ b/Resources/Prototypes/Maps/packed.yml @@ -19,6 +19,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] # Corvax-IAA HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] @@ -48,7 +49,7 @@ SecurityOfficer: [ 4, 4 ] Detective: [ 1, 1 ] SecurityCadet: [ 2, 2 ] - Lawyer: [ 1, 1 ] + #Lawyer: [ 1, 1 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] diff --git a/Resources/Prototypes/Maps/train.yml b/Resources/Prototypes/Maps/train.yml index b18db7aea8d..efe60dea727 100644 --- a/Resources/Prototypes/Maps/train.yml +++ b/Resources/Prototypes/Maps/train.yml @@ -23,6 +23,7 @@ availableJobs: #service Captain: [ 1, 1 ] + IAA: [ 1, 1 ] HeadOfPersonnel: [ 1, 1 ] Bartender: [ 1, 1 ] Botanist: [ 2, 2 ] @@ -51,7 +52,7 @@ Warden: [ 1, 1 ] SecurityOfficer: [ 6, 6 ] SecurityCadet: [ 3, 3 ] - Lawyer: [ 1, 2 ] + #Lawyer: [ 1, 2 ] # Corvax-IAA #supply Quartermaster: [ 1, 1 ] SalvageSpecialist: [ 2, 2 ] diff --git a/Resources/Prototypes/Objectives/ninja.yml b/Resources/Prototypes/Objectives/ninja.yml index 0203059c2c4..de3849c9449 100644 --- a/Resources/Prototypes/Objectives/ninja.yml +++ b/Resources/Prototypes/Objectives/ninja.yml @@ -22,8 +22,8 @@ sprite: Objects/Tools/emag.rsi state: icon - type: NumberObjective - min: 15 - max: 40 + min: 5 # Corvax-MRP + max: 25 # Corvax-MRP title: objective-condition-doorjack-title description: objective-condition-doorjack-description - type: DoorjackCondition diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index ff126eb5d16..ce28163fb55 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -34,7 +34,7 @@ weights: EscapeShuttleObjective: 1 DieObjective: 0.05 - #HijackShuttleObjective: 0.02 + HijackShuttleObjective: 0.02 #Corvax-Hijack - type: weightedRandom id: TraitorObjectiveGroupSocial diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 98cb1a3d51c..5ba05dd41e2 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -793,6 +793,17 @@ Cloth: 200 Durathread: 150 +- type: latheRecipe # Corvax-Resprite: Old HOS mantle + id: ClothingNeckMantleHOSShoulder + icon: + sprite: Clothing/Neck/mantles/hosmantle_shoulder.rsi + state: icon + result: ClothingNeckMantleHOSShoulder + completetime: 2.8 + materials: + Cloth: 200 + Durathread: 150 + - type: latheRecipe id: ClothingNeckMantleRD result: ClothingNeckMantleRD diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index b1a2e6df1dd..6460c745fa3 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -134,7 +134,6 @@ - type: latheRecipe id: Medkit result: Medkit - name: first aid kit (empty) completetime: 2 materials: Plastic: 300 @@ -142,7 +141,6 @@ - type: latheRecipe id: MedkitBurn result: MedkitBurn - name: burn treatment kit (empty) completetime: 2 materials: Plastic: 300 @@ -150,7 +148,6 @@ - type: latheRecipe id: MedkitToxin result: MedkitToxin - name: toxin treatment kit (empty) completetime: 2 materials: Plastic: 300 @@ -158,7 +155,6 @@ - type: latheRecipe id: MedkitO2 result: MedkitO2 - name: oxygen deprivation treatment kit (empty) completetime: 2 materials: Plastic: 300 @@ -166,7 +162,6 @@ - type: latheRecipe id: MedkitBrute result: MedkitBrute - name: brute trauma treatment kit (empty) completetime: 2 materials: Plastic: 300 @@ -174,7 +169,6 @@ - type: latheRecipe id: MedkitAdvanced result: MedkitAdvanced - name: advanced first aid kit (empty) completetime: 2 materials: Plastic: 300 @@ -182,7 +176,6 @@ - type: latheRecipe id: MedkitRadiation result: MedkitRadiation - name: radiation treatment kit (empty) completetime: 2 materials: Plastic: 300 @@ -190,7 +183,6 @@ - type: latheRecipe id: MedkitCombat result: MedkitCombat - name: combat medical kit (empty) completetime: 2 materials: Plastic: 300 diff --git a/Resources/Prototypes/Roles/Antags/nukeops.yml b/Resources/Prototypes/Roles/Antags/nukeops.yml index 4075005e685..3c37f037aef 100644 --- a/Resources/Prototypes/Roles/Antags/nukeops.yml +++ b/Resources/Prototypes/Roles/Antags/nukeops.yml @@ -6,7 +6,10 @@ objective: roles-antag-nuclear-operative-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 54000 # 15h # Corvax-RoleTime + - !type:DepartmentTimeRequirement + department: Security + time: 18000 # 5h # Corvax-RoleTime - type: antag id: NukeopsMedic @@ -16,10 +19,13 @@ objective: roles-antag-nuclear-operative-agent-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 54000 # 15h # Corvax-RoleTime - !type:RoleTimeRequirement - role: JobChemist - time: 10800 # 3h + role: JobChemist + time: 36000 # 10h # Corvax-RoleTime + - !type:DepartmentTimeRequirement + department: Security + time: 36000 # 10h # Corvax-RoleTime - type: antag id: NukeopsCommander @@ -29,8 +35,8 @@ objective: roles-antag-nuclear-operative-commander-objective requirements: - !type:OverallPlaytimeRequirement - time: 18000 # 5h + time: 108000 # 30h # Corvax-RoleTime - !type:DepartmentTimeRequirement department: Security - time: 18000 # 5h + time: 54000 # 15h # Corvax-RoleTime # should be changed to nukie playtime when thats tracked (wyci) diff --git a/Resources/Prototypes/Roles/Antags/revolutionary.yml b/Resources/Prototypes/Roles/Antags/revolutionary.yml index c5e6cb81498..10d8ba502da 100644 --- a/Resources/Prototypes/Roles/Antags/revolutionary.yml +++ b/Resources/Prototypes/Roles/Antags/revolutionary.yml @@ -4,6 +4,9 @@ antagonist: true setPreference: true objective: roles-antag-rev-head-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 108000 # 30h # Corvax-RoleTime - type: antag id: Rev diff --git a/Resources/Prototypes/Roles/Antags/traitor.yml b/Resources/Prototypes/Roles/Antags/traitor.yml index a4e1fe8d109..3efba59db1c 100644 --- a/Resources/Prototypes/Roles/Antags/traitor.yml +++ b/Resources/Prototypes/Roles/Antags/traitor.yml @@ -4,3 +4,6 @@ antagonist: true setPreference: true objective: roles-antag-syndicate-agent-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 108000 # 30h # Corvax-RoleTime diff --git a/Resources/Prototypes/Roles/Antags/zombie.yml b/Resources/Prototypes/Roles/Antags/zombie.yml index 2ba5640891f..2196b06c65a 100644 --- a/Resources/Prototypes/Roles/Antags/zombie.yml +++ b/Resources/Prototypes/Roles/Antags/zombie.yml @@ -4,6 +4,9 @@ antagonist: true setPreference: true objective: roles-antag-initial-infected-objective + requirements: + - !type:OverallPlaytimeRequirement + time: 108000 # 30h # Corvax-RoleTime - type: antag id: Zombie diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml index 36d904c56ea..28f82cf5a8f 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml @@ -4,21 +4,22 @@ description: job-description-qm playTimeTracker: JobQuartermaster requirements: - - !type:RoleTimeRequirement - role: JobCargoTechnician - time: 21600 #6 hrs +# - !type:RoleTimeRequirement +# role: JobCargoTechnician +# time: 21600 #6 hrs - !type:RoleTimeRequirement role: JobSalvageSpecialist - time: 10800 #3 hrs + time: 36000 #10 hrs # Corvax-RoleTime - !type:DepartmentTimeRequirement department: Cargo - time: 36000 #10 hours - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 54000 #15 hrs # Corvax-RoleTime +# - !type:OverallPlaytimeRequirement +# time: 144000 #40 hrs weight: 10 startingGear: QuartermasterGear icon: "JobIconQuarterMaster" supervisors: job-supervisors-captain + radioBold: true canBeAntag: false access: - Cargo @@ -34,6 +35,8 @@ - !type:AddComponentSpecial components: - type: CommandStaff + speciesBlacklist: + - Vox - type: startingGear id: QuartermasterGear @@ -41,4 +44,4 @@ id: QuartermasterPDA ears: ClothingHeadsetQM belt: BoxFolderClipboard - pocket1: AppraisalTool \ No newline at end of file + pocket1: AppraisalTool diff --git a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml index 7b3fcd6b58d..77b21108c7e 100644 --- a/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml +++ b/Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml @@ -7,8 +7,8 @@ - !type:DepartmentTimeRequirement department: Cargo time: 10800 # 3 hrs - - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs +# - !type:OverallPlaytimeRequirement +# time: 36000 #10 hrs icon: "JobIconShaftMiner" startingGear: SalvageSpecialistGear supervisors: job-supervisors-qm diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml index b43f929d694..b245abb5f99 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/assistant.yml @@ -6,8 +6,8 @@ startingGear: PassengerGear icon: "JobIconPassenger" supervisors: job-supervisors-everyone - access: - - Maintenance +# access: # Corvax-MRP +# - Maintenance - type: startingGear id: PassengerGear diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml index a49e3cef7fa..2fc70192181 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/bartender.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 + time: 3600 #1 hrs # Corvax-RoleTime startingGear: BartenderGear icon: "JobIconBartender" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml index 1dda98bb37d..2b915040821 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/chef.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Civilian - time: 1800 + time: 3600 #1 hrs # Corvax-RoleTime startingGear: ChefGear icon: "JobIconChef" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml index c70b4a99435..8fa2cb61fc7 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/clown.yml @@ -3,6 +3,9 @@ name: job-name-clown description: job-description-clown playTimeTracker: JobClown + requirements: + - !type:OverallPlaytimeRequirement + time: 90000 #25 hrs # Corvax-RoleTime startingGear: ClownGear icon: "JobIconClown" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml index 1a321aff400..9b4c9bd29cb 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/lawyer.yml @@ -7,6 +7,7 @@ - !type:OverallPlaytimeRequirement time: 36000 # 10 hrs startingGear: LawyerGear + setPreference: false # Corvax-IAA icon: "JobIconLawyer" supervisors: job-supervisors-hop access: diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml index 1eac292eee3..19d363b9c2d 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/mime.yml @@ -4,8 +4,8 @@ description: job-description-mime playTimeTracker: JobMime requirements: - - !type:OverallPlaytimeRequirement - time: 14400 #4 hrs + - !type:OverallPlaytimeRequirement + time: 90000 #25 hrs # Corvax-RoleTime startingGear: MimeGear icon: "JobIconMime" supervisors: job-supervisors-hop diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml index 1ba1e998f68..607b3226ec8 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/musician.yml @@ -5,7 +5,7 @@ playTimeTracker: JobMusician startingGear: MusicianGear icon: "JobIconMusician" - supervisors: job-supervisors-hire + supervisors: job-supervisors-hop # Corvax-JobSupervisors access: - Maintenance # TODO Remove maint access for all gimmick jobs once access work is completed - Theatre diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index db238266737..5686bc29a2b 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -6,7 +6,7 @@ startingGear: ServiceWorkerGear icon: "JobIconServiceWorker" supervisors: job-supervisors-service - canBeAntag: false + canBeAntag: true # Corvax-MRP: Available not only for newbies access: - Service - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml index d16be5c350a..39c24749330 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml @@ -7,5 +7,5 @@ icon: JobIconVisitor setPreference: false overrideConsoleVisibility: true - access: - - Maintenance +# access: # Corvax-MRP +# - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Command/captain.yml b/Resources/Prototypes/Roles/Jobs/Command/captain.yml index dd7445670aa..82a1f45cd72 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml @@ -1,4 +1,4 @@ -- type: job +- type: job id: Captain name: job-name-captain description: job-description-captain @@ -6,22 +6,25 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # 15 hours + time: 72000 #20 hrs # Corvax-RoleTime - !type:DepartmentTimeRequirement department: Medical - time: 54000 # 15 hours + time: 72000 #20 hrs # Corvax-RoleTime - !type:DepartmentTimeRequirement department: Security - time: 54000 # 15 hours - - !type:DepartmentTimeRequirement - department: Command - time: 54000 # 15 hours + time: 72000 #20 hrs # Corvax-RoleTime +# - !type:DepartmentTimeRequirement +# department: Command +# time: 54000 # 15 hours + - !type:OverallPlaytimeRequirement + time: 504000 #140 hrs # Corvax-RoleTime weight: 20 startingGear: CaptainGear icon: "JobIconCaptain" requireAdminNotify: true joinNotifyCrew: true supervisors: job-supervisors-centcom + radioBold: true canBeAntag: false accessGroups: - AllAccess @@ -31,6 +34,8 @@ - !type:AddComponentSpecial components: - type: CommandStaff + speciesBlacklist: + - Vox - type: startingGear id: CaptainGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml index 37c73f38e02..7b69e6d0696 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/centcom_official.yml @@ -6,12 +6,15 @@ setPreference: false startingGear: CentcomGear icon: "JobIconNanotrasen" - supervisors: job-supervisors-hos + supervisors: job-supervisors-centcom # Corvax-JobSupervisors + radioBold: true canBeAntag: false accessGroups: - AllAccess access: - CentralCommand + speciesBlacklist: + - Vox - type: startingGear id: CentcomGear diff --git a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml index 5f119b64346..5bec9403b89 100644 --- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml +++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml @@ -6,21 +6,24 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 36000 # 10 hours + time: 18000 #5 hrs # Corvax-RoleTime - !type:DepartmentTimeRequirement department: Medical - time: 36000 # 10 hours + time: 18000 #5 hrs # Corvax-RoleTime - !type:DepartmentTimeRequirement department: Security - time: 36000 # 10 hrs - - !type:DepartmentTimeRequirement - department: Command - time: 36000 # 10 hours + time: 18000 #5 hrs # Corvax-RoleTime +# - !type:DepartmentTimeRequirement +# department: Command +# time: 72000 # 20 hrs + - !type:OverallPlaytimeRequirement + time: 180000 #50 hrs # Corvax-RoleTime weight: 20 startingGear: HoPGear icon: "JobIconHeadOfPersonnel" requireAdminNotify: true supervisors: job-supervisors-captain + radioBold: true canBeAntag: false access: - Command @@ -55,6 +58,8 @@ - !type:AddComponentSpecial components: - type: CommandStaff + speciesBlacklist: + - Vox - type: startingGear id: HoPGear diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml index 01af70888d1..ce3ad9bc95f 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/atmospheric_technician.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 54000 # 15 hrs + time: 36000 #10 hrs # Corvax-RoleTime startingGear: AtmosphericTechnicianGear icon: "JobIconAtmosphericTechnician" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml index c55fbfbd418..c5a428a1e64 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml @@ -6,20 +6,21 @@ requirements: - !type:RoleTimeRequirement role: JobAtmosphericTechnician - time: 21600 #6 hrs - - !type:RoleTimeRequirement - role: JobStationEngineer - time: 21600 #6 hrs + time: 36000 #10 hrs # Corvax-RoleTime +# - !type:RoleTimeRequirement +# role: JobStationEngineer +# time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Engineering - time: 36000 #10 hrs - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 54000 #15 hrs # Corvax-RoleTime +# - !type:OverallPlaytimeRequirement +# time: 144000 #40 hrs weight: 10 startingGear: ChiefEngineerGear icon: "JobIconChiefEngineer" requireAdminNotify: true supervisors: job-supervisors-captain + radioBold: true canBeAntag: false access: - Maintenance @@ -36,6 +37,8 @@ - !type:AddComponentSpecial components: - type: CommandStaff + speciesBlacklist: + - Vox - type: startingGear id: ChiefEngineerGear diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml index d3784796810..87f2e9fe3a8 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/station_engineer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Engineering - time: 14400 #4 hrs + time: 18000 #5 hrs # Corvax-RoleTime startingGear: StationEngineerGear icon: "JobIconStationEngineer" supervisors: job-supervisors-ce diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index f3b21e64444..424d8a90f6d 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -8,7 +8,7 @@ time: 3600 #1 hr - !type:DepartmentTimeRequirement department: Engineering - time: 54000 #15 hrs + time: 36000 #10 hrs # Corvax-RoleTime inverted: true # stop playing intern if you're good at engineering! startingGear: TechnicalAssistantGear icon: "JobIconTechnicalAssistant" diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index d4cfc3e29cf..159c0f8c26b 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -104,7 +104,7 @@ eyes: ClothingEyesHudSyndicate ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitSyndie + outerClothing: ClothingOuterHardsuitSyndieBiocode # Sunrise-Edit shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled @@ -122,7 +122,7 @@ ears: ClothingHeadsetAltSyndicate neck: SyndicateWhistle gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitSyndieCommander + outerClothing: ClothingOuterHardsuitSyndieCommanderBiocode # Sunrise-Edit shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled @@ -141,7 +141,7 @@ eyes: ClothingEyesHudSyndicateAgent ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitSyndieMedic + outerClothing: ClothingOuterHardsuitSyndieMedicBiocode # Sunrise-Edit shoes: ClothingShoesBootsMagSyndie id: SyndiAgentPDA pocket1: DoubleEmergencyOxygenTankFilled @@ -158,7 +158,7 @@ eyes: ClothingEyesHudSyndicate ears: ClothingHeadsetAltSyndicate gloves: ClothingHandsGlovesCombat - outerClothing: ClothingOuterHardsuitSyndie + outerClothing: ClothingOuterHardsuitSyndieBiocode # Sunrise-Edit shoes: ClothingShoesBootsCombatFilled id: SyndiPDA pocket1: DoubleEmergencyOxygenTankFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml index 0684d9d36ac..ca232ab82e2 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chemist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 14400 #4 hrs + time: 18000 #5 hrs # Corvax-RoleTime startingGear: ChemistGear icon: "JobIconChemist" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml index e20edb32d45..69ac69afd09 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml @@ -8,20 +8,21 @@ requirements: - !type:RoleTimeRequirement role: JobChemist - time: 10800 #3 hrs - - !type:RoleTimeRequirement - role: JobMedicalDoctor - time: 21600 #6 hrs + time: 18000 #5 hrs # Corvax-RoleTime +# - !type:RoleTimeRequirement +# role: JobMedicalDoctor +# time: 21600 #6 hrs - !type:DepartmentTimeRequirement department: Medical - time: 36000 #10 hrs - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 54000 #15 hrs # Corvax-RoleTime +# - !type:OverallPlaytimeRequirement +# time: 144000 #40 hrs weight: 10 startingGear: CMOGear icon: "JobIconChiefMedicalOfficer" requireAdminNotify: true supervisors: job-supervisors-captain + radioBold: true canBeAntag: false access: - Medical @@ -37,6 +38,8 @@ - !type:AddComponentSpecial components: - type: CommandStaff + speciesBlacklist: + - Vox - type: startingGear id: CMOGear diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml index 27efb3b8b26..f574943c257 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_doctor.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 14400 #4 hrs + time: 7200 #2 hrs # Corvax-RoleTime startingGear: DoctorGear icon: "JobIconMedicalDoctor" supervisors: job-supervisors-cmo diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 199645d5c38..e2154f4b934 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Medical - time: 54000 # 15 hrs + time: 36000 #10 hrs # Corvax-RoleTime inverted: true # stop playing intern if you're good at med! startingGear: MedicalInternGear icon: "JobIconMedicalIntern" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml index b50c61ebdb2..9f8392d01e9 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 54000 #15 hrs + time: 36000 #10 hrs # Corvax-RoleTime inverted: true # stop playing intern if you're good at science! startingGear: ResearchAssistantGear icon: "JobIconResearchAssistant" diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index adf53d9c708..8fb2a9b4c29 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -6,14 +6,15 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 36000 #10 hrs - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 54000 #15 hrs # Corvax-RoleTime +# - !type:OverallPlaytimeRequirement +# time: 144000 #40 hrs weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" requireAdminNotify: true supervisors: job-supervisors-captain + radioBold: true canBeAntag: false access: - Research @@ -28,9 +29,13 @@ - !type:AddComponentSpecial components: - type: CommandStaff + speciesBlacklist: + - Vox - type: startingGear id: ResearchDirectorGear equipment: id: RnDPDA - ears: ClothingHeadsetRD \ No newline at end of file + pocket1: HandheldRoboAnalyzer + pocket2: Nanopaste10 + ears: ClothingHeadsetRD diff --git a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml index 5188e47057e..c5243f40417 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/scientist.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/scientist.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Science - time: 14400 #4 hrs + time: 18000 #5 hrs # Corvax-RoleTime startingGear: ScientistGear icon: "JobIconScientist" supervisors: job-supervisors-rd diff --git a/Resources/Prototypes/Roles/Jobs/Security/detective.yml b/Resources/Prototypes/Roles/Jobs/Security/detective.yml index b17d0d41df8..3c21596b7cb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/detective.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/detective.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 54000 # 15 hours + time: 72000 #20 hrs # Corvax-RoleTime startingGear: DetectiveGear icon: "JobIconDetective" supervisors: job-supervisors-hos @@ -20,6 +20,8 @@ special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] + speciesBlacklist: + - Vox - type: startingGear id: DetectiveGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml index 8646ca8dddd..999a304c126 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml @@ -6,20 +6,21 @@ requirements: - !type:RoleTimeRequirement role: JobWarden - time: 10800 #3 hrs - - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 36000 #10 hrs + time: 36000 #10 hrs # Corvax-RoleTime +# - !type:RoleTimeRequirement +# role: JobSecurityOfficer +# time: 36000 #10 hrs - !type:DepartmentTimeRequirement department: Security - time: 108000 # 30 hrs - - !type:OverallPlaytimeRequirement - time: 144000 #40 hrs + time: 108000 #50 hrs # Corvax-RoleTime +# - !type:OverallPlaytimeRequirement +# time: 144000 #40 hrs weight: 10 startingGear: HoSGear icon: "JobIconHeadOfSecurity" requireAdminNotify: true supervisors: job-supervisors-captain + radioBold: true canBeAntag: false access: - HeadOfSecurity @@ -38,6 +39,8 @@ - !type:AddComponentSpecial components: - type: CommandStaff + speciesBlacklist: + - Vox - type: startingGear id: HoSGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 17e09b232e9..24eae8d4a94 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -5,10 +5,10 @@ playTimeTracker: JobSecurityCadet requirements: - !type:OverallPlaytimeRequirement - time: 36000 #10 hrs + time: 36000 #10 hrs # Corvax-RoleTime - !type:DepartmentTimeRequirement department: Security - time: 54000 #15 hrs + time: 72000 #20 hrs # Corvax-RoleTime inverted: true # stop playing intern if you're good at security! startingGear: SecurityCadetGear icon: "JobIconSecurityCadet" @@ -24,14 +24,16 @@ special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] + speciesBlacklist: + - Vox - type: startingGear id: SecurityCadetGear equipment: - shoes: ClothingShoesBootsCombatFilled + shoes: ClothingShoesBootsJackSec # Corvax-Resprite-MRP outerClothing: ClothingOuterArmorBasic id: SecurityCadetPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled pocket1: WeaponPistolMk58 - pocket2: BookSecurity \ No newline at end of file + pocket2: BookSecurity diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml index edf16448d7c..3fe18668504 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_officer.yml @@ -6,7 +6,7 @@ requirements: - !type:DepartmentTimeRequirement department: Security - time: 36000 #10 hrs + time: 36000 #10 hrs # Corvax-RoleTime startingGear: SecurityOfficerGear icon: "JobIconSecurityOfficer" supervisors: job-supervisors-hos @@ -21,6 +21,8 @@ special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] + speciesBlacklist: + - Vox - type: startingGear id: SecurityOfficerGear diff --git a/Resources/Prototypes/Roles/Jobs/Security/warden.yml b/Resources/Prototypes/Roles/Jobs/Security/warden.yml index 5c1dc985d1e..ba94a3cd311 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/warden.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/warden.yml @@ -4,9 +4,9 @@ description: job-description-warden playTimeTracker: JobWarden requirements: - - !type:RoleTimeRequirement - role: JobSecurityOfficer - time: 36000 #10 hrs + - !type:DepartmentTimeRequirement + department: Security + time: 108000 #50 hrs # Corvax-RoleTime startingGear: WardenGear icon: "JobIconWarden" supervisors: job-supervisors-hos @@ -23,6 +23,8 @@ special: - !type:AddImplantSpecial implants: [ MindShieldImplant ] + speciesBlacklist: + - Vox - type: startingGear id: WardenGear diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 9be98be950c..8ea3e363a6e 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -35,9 +35,10 @@ - type: department id: Command description: department-Command-description - color: "#334E6D" + color: "#052EED" # Sunrise-Edit roles: - Captain + - IAA # Sunrise-Edit - CentralCommandOfficial - ChiefEngineer - ChiefMedicalOfficer diff --git a/Resources/Prototypes/SoundCollections/NukeMusic.yml b/Resources/Prototypes/SoundCollections/NukeMusic.yml index 51782d8bd55..17fa4d96e3f 100644 --- a/Resources/Prototypes/SoundCollections/NukeMusic.yml +++ b/Resources/Prototypes/SoundCollections/NukeMusic.yml @@ -3,4 +3,5 @@ files: - /Audio/StationEvents/running_out.ogg - /Audio/StationEvents/countdown.ogg - - /Audio/StationEvents/clearly_nuclear.ogg \ No newline at end of file + - /Audio/StationEvents/clearly_nuclear.ogg + - /Audio/Corvax/StationEvents/level.ogg # Corvax-NukeMusic diff --git a/Resources/Prototypes/SoundCollections/lobby.yml b/Resources/Prototypes/SoundCollections/lobby.yml index f85a8b22af2..e7640a25a34 100644 --- a/Resources/Prototypes/SoundCollections/lobby.yml +++ b/Resources/Prototypes/SoundCollections/lobby.yml @@ -14,4 +14,6 @@ - /Audio/Lobby/pwmur.ogg - /Audio/Lobby/lasers_rip_apart_the_bulkhead.ogg - /Audio/Lobby/every_light_is_blinking_at_once.ogg + - /Audio/Corvax/Lobby/title2.ogg # Corvax-LobbyMusic - /Audio/Lobby/atomicamnesiammx.ogg + - /Audio/Corvax/Lobby/service.ogg # Corvax-LobbyMusic diff --git a/Resources/Prototypes/SoundCollections/troll.yml b/Resources/Prototypes/SoundCollections/troll.yml index e74e4be53ea..9983f110782 100644 --- a/Resources/Prototypes/SoundCollections/troll.yml +++ b/Resources/Prototypes/SoundCollections/troll.yml @@ -36,3 +36,8 @@ - /Audio/Weapons/ebladeoff.ogg - /Audio/Weapons/ebladeon.ogg - /Audio/Weapons/eblade1.ogg + +- type: soundCollection + id: TrollMeeting + files: + - /Audio/Misc/emergency_meeting.ogg diff --git a/Resources/Prototypes/Species/arachnid.yml b/Resources/Prototypes/Species/arachnid.yml index 07a72cda176..84ee5c7e2d0 100644 --- a/Resources/Prototypes/Species/arachnid.yml +++ b/Resources/Prototypes/Species/arachnid.yml @@ -10,7 +10,8 @@ skinColoration: Hues maleFirstNames: names_arachnid_first femaleFirstNames: names_arachnid_first - lastNames: names_arachnid_last + maleLastNames: names_arachnid_last # Corvax-LastnameGender + femaleLastNames: names_arachnid_last # Corvax-LastnameGender sexes: - Unsexed diff --git a/Resources/Prototypes/Species/diona.yml b/Resources/Prototypes/Species/diona.yml index 19fafaa3e1b..778d549cc3a 100644 --- a/Resources/Prototypes/Species/diona.yml +++ b/Resources/Prototypes/Species/diona.yml @@ -10,7 +10,8 @@ skinColoration: Hues maleFirstNames: DionaFirst femaleFirstNames: DionaFirst - lastNames: DionaLast + maleLastNames: DionaLast # Corvax-LastnameGender + femaleLastNames: DionaLast # Corvax-LastnameGender naming: TheFirstofLast - type: speciesBaseSprites diff --git a/Resources/Prototypes/Species/human.yml b/Resources/Prototypes/Species/human.yml index 0cbd9cc03fd..bb8f23768d1 100644 --- a/Resources/Prototypes/Species/human.yml +++ b/Resources/Prototypes/Species/human.yml @@ -22,6 +22,8 @@ FacialHair: MobHumanoidAnyMarking Snout: MobHumanoidAnyMarking Chest: MobHumanTorso + HeadTop: MobHumanoidAnyMarking # Sunrise-Sponsors + Tail: MobHumanoidAnyMarking # Sunrise-Sponsors Eyes: MobHumanoidEyes LArm: MobHumanLArm RArm: MobHumanRArm @@ -44,11 +46,11 @@ Snout: points: 1 required: false - Tail: # the cat tail joke - points: 0 + Tail: + points: 1 # Sunrise-Sponsors required: false - HeadTop: # the cat ear joke - points: 0 + HeadTop: + points: 1 # Sunrise-Sponsors required: false Chest: points: 1 diff --git a/Resources/Prototypes/Species/moth.yml b/Resources/Prototypes/Species/moth.yml index 4f587eb40e0..b474f613f84 100644 --- a/Resources/Prototypes/Species/moth.yml +++ b/Resources/Prototypes/Species/moth.yml @@ -10,7 +10,8 @@ skinColoration: Hues maleFirstNames: names_moth_first_male femaleFirstNames: names_moth_first_female - lastNames: names_moth_last + maleLastNames: names_moth_last # Corvax-LastnameGender + femaleLastNames: names_moth_last # Corvax-LastnameGender - type: speciesBaseSprites id: MobMothSprites diff --git a/Resources/Prototypes/Species/slime.yml b/Resources/Prototypes/Species/slime.yml index ef49e9b7cf6..895872256bb 100644 --- a/Resources/Prototypes/Species/slime.yml +++ b/Resources/Prototypes/Species/slime.yml @@ -16,6 +16,8 @@ Hair: MobSlimeMarkingFollowSkin FacialHair: MobSlimeMarkingFollowSkin Chest: MobSlimeTorso + HeadTop: MobHumanoidAnyMarking # Corvax Sponsors + Tail: MobHumanoidAnyMarking # Corvax Sponsors Eyes: MobHumanoidEyes LArm: MobSlimeLArm RArm: MobSlimeRArm @@ -35,6 +37,12 @@ FacialHair: points: 1 required: false + Tail: # :despair: + points: 1 # Corvax Sponsors + required: false + HeadTop: # :skull: + points: 1 # Corvax Sponsors + required: false Chest: points: 1 required: false diff --git a/Resources/Prototypes/Species/species_weights.yml b/Resources/Prototypes/Species/species_weights.yml index 63c196b95d6..6b3404836d2 100644 --- a/Resources/Prototypes/Species/species_weights.yml +++ b/Resources/Prototypes/Species/species_weights.yml @@ -5,4 +5,11 @@ Human: 5 Reptilian: 4 SlimePerson: 4 + # Sunrise-Start + Vulpkanin: 4 + Synth: 4 + Swine: 4 + Felinid: 2 + Vox: 2 + # Sunrise-End Diona: 2 diff --git a/Resources/Prototypes/Species/vox.yml b/Resources/Prototypes/Species/vox.yml index e3fdb2bf08f..efa5b81cad9 100644 --- a/Resources/Prototypes/Species/vox.yml +++ b/Resources/Prototypes/Species/vox.yml @@ -1,7 +1,7 @@ - type: species id: Vox name: species-name-vox - roundStart: false # sad + roundStart: true # Sunrise-Edit prototype: MobVox sprites: MobVoxSprites markingLimits: MobVoxMarkingLimits @@ -13,6 +13,7 @@ naming: First sexes: - Unsexed + startingGear: VoxGear - type: speciesBaseSprites id: MobVoxSprites @@ -155,3 +156,9 @@ baseSprite: sprite: Mobs/Species/Vox/parts.rsi state: r_foot + +- type: startingGear + id: VoxGear + equipment: + mask: ClothingMaskBreath + pocket1: DoubleEmergencyNitrogenTankFilled diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 6275f0bc07e..529f2bd291b 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -2,7 +2,7 @@ id: JobIcon abstract: true priority: 1 - locationPreference: Right + locationPreference: Left # Corvax-TypingIndicator isShaded: true - type: statusIcon diff --git a/Resources/Prototypes/StatusEffects/security.yml b/Resources/Prototypes/StatusEffects/security.yml index 00119fb44d2..6394ce3db27 100644 --- a/Resources/Prototypes/StatusEffects/security.yml +++ b/Resources/Prototypes/StatusEffects/security.yml @@ -3,7 +3,7 @@ abstract: true priority: 3 offset: 1 - locationPreference: Right + locationPreference: Left # Corvax-TypingIndicator isShaded: true - type: statusIcon diff --git a/Resources/Prototypes/StatusEffects/ssd.yml b/Resources/Prototypes/StatusEffects/ssd.yml index 70253cc6b19..97f06247353 100644 --- a/Resources/Prototypes/StatusEffects/ssd.yml +++ b/Resources/Prototypes/StatusEffects/ssd.yml @@ -3,4 +3,4 @@ icon: sprite: /Textures/Effects/ssd.rsi state: default0 - locationPreference: Left + locationPreference: Right # Corvax-TypingIndicator diff --git a/Resources/Prototypes/StatusIcon/antag.yml b/Resources/Prototypes/StatusIcon/antag.yml index 0dbdfce4f97..42776b08c13 100644 --- a/Resources/Prototypes/StatusIcon/antag.yml +++ b/Resources/Prototypes/StatusIcon/antag.yml @@ -29,7 +29,7 @@ - type: statusIcon id: MindShieldIcon priority: 2 - locationPreference: Right + locationPreference: Left # Corvax-TypingIndicator layer: Mod isShaded: true icon: @@ -39,7 +39,7 @@ - type: statusIcon id: SyndicateFaction priority: 0 - locationPreference: Left + locationPreference: Right # Corvax-TypingIndicator icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Syndicate diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml index 5a158bdcfc8..c6848b2b397 100644 --- a/Resources/Prototypes/Tiles/planet.yml +++ b/Resources/Prototypes/Tiles/planet.yml @@ -16,12 +16,14 @@ sprite: /Textures/Tiles/Planet/Desert/desert.png variants: 6 placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 +# Corvax-Mapping-Start: Better visual look + - 0.75 + - 0.06 + - 0.06 + - 0.06 + - 0.06 + - 0.01 +# Corvax-Mapping-End isSubfloor: true footstepSounds: collection: FootstepAsteroid diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml index 7271770ef50..634baa17be1 100644 --- a/Resources/Prototypes/typing_indicator.yml +++ b/Resources/Prototypes/typing_indicator.yml @@ -1,50 +1,61 @@ -- type: typingIndicator +- type: typingIndicator id: default typingState: default0 + idleState: default3 # Corvax-TypingIndicator - type: typingIndicator id: robot typingState: robot0 + idleState: robot3 # Corvax-TypingIndicator - type: typingIndicator id: alien typingState: alien0 + idleState: alien3 # Corvax-TypingIndicator - type: typingIndicator id: guardian typingState: guardian0 + idleState: guardian3 # Corvax-TypingIndicator - type: typingIndicator id: holo typingState: holo0 + idleState: holo3 # Corvax-TypingIndicator offset: 0, 0.0625 - type: typingIndicator id: lawyer typingState: lawyer0 + idleState: lawyer3 # Corvax-TypingIndicator offset: 0, 0.125 - type: typingIndicator id: moth typingState: moth0 + idleState: moth3 # Corvax-TypingIndicator offset: 0, 0.125 - type: typingIndicator id: spider typingState: spider0 + idleState: spider3 # Corvax-TypingIndicator offset: 0, 0.125 - type: typingIndicator id: vox typingState: vox0 + idleState: vox3 # Corvax-TypingIndicator offset: -0.125, 0.125 - type: typingIndicator id: lizard typingState: lizard0 + idleState: lizard3 # Corvax-TypingIndicator offset: 0, 0.0625 - type: typingIndicator id: slime typingState: slime0 + idleState: slime3 # Corvax-TypingIndicator offset: 0, 0.125