diff --git a/Resources/ConfigPresets/DeltaV/apoapsis.toml b/Resources/ConfigPresets/DeltaV/apoapsis.toml deleted file mode 100644 index 7ba1d0f282e..00000000000 --- a/Resources/ConfigPresets/DeltaV/apoapsis.toml +++ /dev/null @@ -1,21 +0,0 @@ -[game] -hostname = "[EN][MRP] Delta-v (Ψ) | Apoapsis" -soft_max_players = 100 - -[server] -rules_file = "Rules.txt" -rules_header = "ui-rules-header" - -[whitelist] -enabled = false -reason = "whitelist-not-whitelisted" -min_players = 90 - -[shuttle] -emergency_early_launch_allowed = true - -[hub] -tags = "lang:en-US,region:am_n_e,rp:med" - -[atmos] -monstermos_rip_tiles = false diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml deleted file mode 100644 index f784373d715..00000000000 --- a/Resources/ConfigPresets/DeltaV/deltav.toml +++ /dev/null @@ -1,48 +0,0 @@ -[game] -desc = "Featuring loads of unique content and psionics." -lobbyenabled = true -lobbyduration = 240 -round_end_pacifist = true - -[infolinks] -discord = "https://go.delta-v.org/sxzqj" -github = "https://github.com/DeltaV-Station/Delta-v" -website = "https://www.delta-v.org/" -wiki = "https://wiki.delta-v.org/view/Main_Page" -patreon = "https://www.patreon.com/Delta_v" -bug_report = "https://github.com/DeltaV-Station/Delta-v/issues/new/choose" -forum = "https://forum.delta-v.org/" -appeal = "https://go.delta-v.org/appeal" - -[net] -max_connections = 1024 -tickrate = 30 - -[vote] -restart_required_ratio = 0.7 - -[netres] -limit = 10.0 - -[admin] -see_own_notes = true -deadmin_on_join = true - -[events] -ramping_average_end_time = 180.0 -ramping_average_chaos = 4.5 - -[atmos] -monstermos_rip_tiles = false - -[server] -id = "deltav" - -[discord] -rich_main_icon_id = "deltav" - -[ic] -flavor_text = true - -#[worldgen] -#enabled = true diff --git a/Resources/ConfigPresets/DeltaV/inclination.toml b/Resources/ConfigPresets/DeltaV/inclination.toml deleted file mode 100644 index c655bb796c0..00000000000 --- a/Resources/ConfigPresets/DeltaV/inclination.toml +++ /dev/null @@ -1,17 +0,0 @@ -[game] -hostname = "[EN][EU][MRP] Delta-v (Ψ) | Inclination" -soft_max_players = 50 - -[server] -rules_file = "Rules.txt" -rules_header = "ui-rules-header" - -[vote] -preset_enabled = true -map_enabled = true - -[ooc] -enable_during_round = true - -[hub] -tags = "lang:en-US,region:eu_w,rp:med" diff --git a/Resources/ConfigPresets/DeltaV/periapsis.toml b/Resources/ConfigPresets/DeltaV/periapsis.toml deleted file mode 100644 index ad6cae56283..00000000000 --- a/Resources/ConfigPresets/DeltaV/periapsis.toml +++ /dev/null @@ -1,22 +0,0 @@ -[game] -hostname = "[EN][MRP] Delta-v (Ψ) | Periapsis" -soft_max_players = 50 - -[server] -rules_file = "Rules.txt" -rules_header = "ui-rules-header" - -[vote] -preset_enabled = true -map_enabled = true - -[whitelist] -enabled = false -reason = "whitelist-not-whitelisted-peri" -min_players = 10 - -[ooc] -enable_during_round = true - -[hub] -tags = "lang:en-US,region:am_n_e,rp:med" diff --git a/Resources/Locale/en-US/deltav/accent/scottish.ftl b/Resources/Locale/en-US/accent/scottish.ftl similarity index 100% rename from Resources/Locale/en-US/deltav/accent/scottish.ftl rename to Resources/Locale/en-US/accent/scottish.ftl diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 147aebb5c5d..dbe4dae9eff 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -414,3 +414,170 @@ # chatsan-word-40: chatsan-replacement-etcetera # chatsan-word-41: chatsan-replacement-41 # chatsan-word-42: chatsan-replacement-42 + +- type: accent + id: scottish + wordReplacements: + accent-scottish-words-1: accent-scottish-words-replace-1 + accent-scottish-words-2: accent-scottish-words-replace-2 + accent-scottish-words-3: accent-scottish-words-replace-3 + accent-scottish-words-4: accent-scottish-words-replace-4 + accent-scottish-words-5: accent-scottish-words-replace-5 + accent-scottish-words-6: accent-scottish-words-replace-6 + accent-scottish-words-7: accent-scottish-words-replace-7 + accent-scottish-words-8: accent-scottish-words-replace-8 + accent-scottish-words-9: accent-scottish-words-replace-9 + accent-scottish-words-10: accent-scottish-words-replace-10 + accent-scottish-words-11: accent-scottish-words-replace-11 + accent-scottish-words-12: accent-scottish-words-replace-12 + accent-scottish-words-13: accent-scottish-words-replace-13 + accent-scottish-words-14: accent-scottish-words-replace-14 + accent-scottish-words-15: accent-scottish-words-replace-15 + accent-scottish-words-16: accent-scottish-words-replace-16 + accent-scottish-words-17: accent-scottish-words-replace-17 + accent-scottish-words-18: accent-scottish-words-replace-18 + accent-scottish-words-19: accent-scottish-words-replace-19 + accent-scottish-words-20: accent-scottish-words-replace-20 + accent-scottish-words-21: accent-scottish-words-replace-21 + accent-scottish-words-22: accent-scottish-words-replace-22 + accent-scottish-words-23: accent-scottish-words-replace-23 + accent-scottish-words-24: accent-scottish-words-replace-24 + accent-scottish-words-25: accent-scottish-words-replace-25 + accent-scottish-words-26: accent-scottish-words-replace-26 + accent-scottish-words-27: accent-scottish-words-replace-27 + accent-scottish-words-28: accent-scottish-words-replace-28 + accent-scottish-words-29: accent-scottish-words-replace-29 + accent-scottish-words-30: accent-scottish-words-replace-30 + accent-scottish-words-31: accent-scottish-words-replace-31 + accent-scottish-words-32: accent-scottish-words-replace-32 + accent-scottish-words-33: accent-scottish-words-replace-33 + accent-scottish-words-34: accent-scottish-words-replace-34 + accent-scottish-words-35: accent-scottish-words-replace-35 + accent-scottish-words-36: accent-scottish-words-replace-36 + accent-scottish-words-37: accent-scottish-words-replace-37 + accent-scottish-words-38: accent-scottish-words-replace-38 + accent-scottish-words-39: accent-scottish-words-replace-39 + accent-scottish-words-40: accent-scottish-words-replace-40 + accent-scottish-words-41: accent-scottish-words-replace-41 + accent-scottish-words-42: accent-scottish-words-replace-42 + accent-scottish-words-43: accent-scottish-words-replace-43 + accent-scottish-words-44: accent-scottish-words-replace-44 + accent-scottish-words-45: accent-scottish-words-replace-45 + accent-scottish-words-46: accent-scottish-words-replace-46 + accent-scottish-words-47: accent-scottish-words-replace-47 + accent-scottish-words-48: accent-scottish-words-replace-48 + accent-scottish-words-49: accent-scottish-words-replace-49 + accent-scottish-words-50: accent-scottish-words-replace-50 + accent-scottish-words-51: accent-scottish-words-replace-51 + accent-scottish-words-52: accent-scottish-words-replace-52 + accent-scottish-words-53: accent-scottish-words-replace-53 + accent-scottish-words-54: accent-scottish-words-replace-54 + accent-scottish-words-55: accent-scottish-words-replace-55 + accent-scottish-words-56: accent-scottish-words-replace-56 + accent-scottish-words-57: accent-scottish-words-replace-57 + accent-scottish-words-58: accent-scottish-words-replace-58 + accent-scottish-words-59: accent-scottish-words-replace-59 + accent-scottish-words-60: accent-scottish-words-replace-60 + accent-scottish-words-61: accent-scottish-words-replace-61 + accent-scottish-words-62: accent-scottish-words-replace-62 + accent-scottish-words-63: accent-scottish-words-replace-63 + accent-scottish-words-64: accent-scottish-words-replace-64 + accent-scottish-words-65: accent-scottish-words-replace-65 + accent-scottish-words-66: accent-scottish-words-replace-66 + accent-scottish-words-67: accent-scottish-words-replace-67 + accent-scottish-words-68: accent-scottish-words-replace-68 + accent-scottish-words-69: accent-scottish-words-replace-69 + accent-scottish-words-70: accent-scottish-words-replace-70 + accent-scottish-words-71: accent-scottish-words-replace-71 + accent-scottish-words-72: accent-scottish-words-replace-72 + accent-scottish-words-73: accent-scottish-words-replace-73 + accent-scottish-words-74: accent-scottish-words-replace-74 + accent-scottish-words-75: accent-scottish-words-replace-75 + accent-scottish-words-76: accent-scottish-words-replace-76 + accent-scottish-words-77: accent-scottish-words-replace-77 + accent-scottish-words-78: accent-scottish-words-replace-78 + accent-scottish-words-79: accent-scottish-words-replace-79 + accent-scottish-words-80: accent-scottish-words-replace-80 + accent-scottish-words-81: accent-scottish-words-replace-81 + accent-scottish-words-82: accent-scottish-words-replace-82 + accent-scottish-words-83: accent-scottish-words-replace-83 + accent-scottish-words-84: accent-scottish-words-replace-84 + accent-scottish-words-85: accent-scottish-words-replace-85 + accent-scottish-words-86: accent-scottish-words-replace-86 + accent-scottish-words-87: accent-scottish-words-replace-87 + accent-scottish-words-88: accent-scottish-words-replace-88 + accent-scottish-words-89: accent-scottish-words-replace-89 + accent-scottish-words-90: accent-scottish-words-replace-90 + accent-scottish-words-91: accent-scottish-words-replace-91 + accent-scottish-words-92: accent-scottish-words-replace-92 + accent-scottish-words-93: accent-scottish-words-replace-93 + accent-scottish-words-94: accent-scottish-words-replace-94 + accent-scottish-words-95: accent-scottish-words-replace-95 + accent-scottish-words-96: accent-scottish-words-replace-96 + accent-scottish-words-97: accent-scottish-words-replace-97 + accent-scottish-words-98: accent-scottish-words-replace-98 + accent-scottish-words-99: accent-scottish-words-replace-99 + accent-scottish-words-100: accent-scottish-words-replace-100 + accent-scottish-words-101: accent-scottish-words-replace-101 + accent-scottish-words-102: accent-scottish-words-replace-102 + accent-scottish-words-103: accent-scottish-words-replace-103 + accent-scottish-words-104: accent-scottish-words-replace-104 + accent-scottish-words-105: accent-scottish-words-replace-105 + accent-scottish-words-106: accent-scottish-words-replace-106 + accent-scottish-words-107: accent-scottish-words-replace-107 + accent-scottish-words-108: accent-scottish-words-replace-108 + accent-scottish-words-109: accent-scottish-words-replace-109 + accent-scottish-words-110: accent-scottish-words-replace-110 + accent-scottish-words-111: accent-scottish-words-replace-111 + accent-scottish-words-112: accent-scottish-words-replace-112 + accent-scottish-words-113: accent-scottish-words-replace-113 + accent-scottish-words-114: accent-scottish-words-replace-114 + accent-scottish-words-115: accent-scottish-words-replace-115 + accent-scottish-words-116: accent-scottish-words-replace-116 + accent-scottish-words-117: accent-scottish-words-replace-117 + accent-scottish-words-118: accent-scottish-words-replace-118 + accent-scottish-words-119: accent-scottish-words-replace-119 + accent-scottish-words-120: accent-scottish-words-replace-120 + accent-scottish-words-121: accent-scottish-words-replace-121 + accent-scottish-words-122: accent-scottish-words-replace-122 + accent-scottish-words-123: accent-scottish-words-replace-123 + accent-scottish-words-124: accent-scottish-words-replace-124 + accent-scottish-words-125: accent-scottish-words-replace-125 + accent-scottish-words-126: accent-scottish-words-replace-126 + accent-scottish-words-127: accent-scottish-words-replace-127 + accent-scottish-words-128: accent-scottish-words-replace-128 + accent-scottish-words-129: accent-scottish-words-replace-129 + accent-scottish-words-130: accent-scottish-words-replace-130 + accent-scottish-words-131: accent-scottish-words-replace-131 + accent-scottish-words-132: accent-scottish-words-replace-132 + accent-scottish-words-133: accent-scottish-words-replace-133 + accent-scottish-words-134: accent-scottish-words-replace-134 + accent-scottish-words-135: accent-scottish-words-replace-135 + accent-scottish-words-136: accent-scottish-words-replace-136 + accent-scottish-words-137: accent-scottish-words-replace-137 + accent-scottish-words-138: accent-scottish-words-replace-138 + accent-scottish-words-139: accent-scottish-words-replace-139 + accent-scottish-words-140: accent-scottish-words-replace-140 + accent-scottish-words-141: accent-scottish-words-replace-141 + accent-scottish-words-142: accent-scottish-words-replace-142 + accent-scottish-words-143: accent-scottish-words-replace-143 + accent-scottish-words-144: accent-scottish-words-replace-144 + accent-scottish-words-145: accent-scottish-words-replace-145 + accent-scottish-words-146: accent-scottish-words-replace-146 + accent-scottish-words-147: accent-scottish-words-replace-147 + accent-scottish-words-148: accent-scottish-words-replace-148 + accent-scottish-words-149: accent-scottish-words-replace-149 + accent-scottish-words-150: accent-scottish-words-replace-150 + accent-scottish-words-151: accent-scottish-words-replace-151 + accent-scottish-words-152: accent-scottish-words-replace-152 + accent-scottish-words-153: accent-scottish-words-replace-153 + accent-scottish-words-154: accent-scottish-words-replace-154 + accent-scottish-words-155: accent-scottish-words-replace-155 + accent-scottish-words-156: accent-scottish-words-replace-156 + accent-scottish-words-157: accent-scottish-words-replace-157 + accent-scottish-words-158: accent-scottish-words-replace-158 + accent-scottish-words-159: accent-scottish-words-replace-159 + accent-scottish-words-160: accent-scottish-words-replace-160 + accent-scottish-words-161: accent-scottish-words-replace-161 + accent-scottish-words-162: accent-scottish-words-replace-162 + accent-scottish-words-163: accent-scottish-words-replace-163 diff --git a/Resources/Prototypes/Access/cargo.yml b/Resources/Prototypes/Access/cargo.yml index dfcfcd10f78..8c9d82fe418 100644 --- a/Resources/Prototypes/Access/cargo.yml +++ b/Resources/Prototypes/Access/cargo.yml @@ -10,11 +10,15 @@ id: Salvage name: id-card-access-level-salvage +- type: accessLevel + id: Orders + name: id-card-access-level-orders # Custom access level that allows the approval of orders + - type: accessGroup id: Cargo tags: - Quartermaster - Salvage - Cargo - - Mail # Nyanotrasen - MailCarrier, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Cargo/mail-carrier.yml - - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml + - Mail + - Orders \ No newline at end of file diff --git a/Resources/Prototypes/Access/research.yml b/Resources/Prototypes/Access/epistemics.yml similarity index 58% rename from Resources/Prototypes/Access/research.yml rename to Resources/Prototypes/Access/epistemics.yml index f0de2c93db4..66caa7f20d4 100644 --- a/Resources/Prototypes/Access/research.yml +++ b/Resources/Prototypes/Access/epistemics.yml @@ -6,9 +6,14 @@ id: Research name: id-card-access-level-research +- type: accessLevel + id: Mantis + name: id-card-access-level-mantis # Custom access level for the Mantis so they can have their own locker and maybe doors + + - type: accessGroup id: Research tags: - ResearchDirector - Research - - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml + - Mantis diff --git a/Resources/Prototypes/Access/medical.yml b/Resources/Prototypes/Access/medical.yml index d4b84d89c05..03a102c9e5b 100644 --- a/Resources/Prototypes/Access/medical.yml +++ b/Resources/Prototypes/Access/medical.yml @@ -14,6 +14,10 @@ id: Paramedic name: id-card-access-level-paramedic +- type: accessLevel + id: Psychologist + name: id-card-access-level-psychologist + - type: accessGroup id: Medical tags: diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml index ab17f6e41e5..bec469d1298 100644 --- a/Resources/Prototypes/Access/misc.yml +++ b/Resources/Prototypes/Access/misc.yml @@ -44,3 +44,53 @@ - Musician # DeltaV - Add Musician access - Reporter # DeltaV - Add Reporter access - Zookeeper # DeltaV - Add Zookeeper access + +- type: accessLevel + id: DV-SpareSafe + name: id-card-access-level-unused + +- type: accessGroup + id: AllAccessBorg + tags: +# - EmergencyShuttleRepealAll +# - Captain +# - HeadOfPersonnel +# - ChiefEngineer +# - ChiefMedicalOfficer +# - HeadOfSecurity +# - ResearchDirector + - Command + - Security + - Detective +# - Armory + - Lawyer + - Engineering + - Medical +# - Quartermaster + - Salvage + - Cargo + - Research + - Service + - Maintenance + - External + - Janitor + - Theatre + - Bar + - Chemistry + - Kitchen + - Chapel + - Hydroponics + - Atmospherics + - Mail +# - Orders + - Mantis + - Paramedic + - Psychologist + - Boxer + - Clown + - Library + - Mime + - Musician + - Reporter + - Zookeeper + diff --git a/Resources/Prototypes/Access/service.yml b/Resources/Prototypes/Access/service.yml index b8a553dd8e1..0e713fd2eca 100644 --- a/Resources/Prototypes/Access/service.yml +++ b/Resources/Prototypes/Access/service.yml @@ -30,6 +30,35 @@ id: Lawyer name: id-card-access-level-lawyer +- type: accessLevel + id: Boxer + name: id-card-access-level-boxer + +- type: accessLevel + id: Clown + name: id-card-access-level-clown + +- type: accessLevel + id: Library + name: id-card-access-level-library + +- type: accessLevel + id: Mime + name: id-card-access-level-mime + +- type: accessLevel + id: Musician + name: id-card-access-level-musician + +- type: accessLevel + id: Reporter + name: id-card-access-level-reporter + +- type: accessLevel + id: Zookeeper + name: id-card-access-level-zookeeper + + - type: accessGroup id: Service tags: diff --git a/Resources/Prototypes/DeltaV/Body/Organs/harpy.yml b/Resources/Prototypes/Body/Organs/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Body/Organs/harpy.yml rename to Resources/Prototypes/Body/Organs/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml b/Resources/Prototypes/Body/Organs/vulpkanin.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Body/Organs/vulpkanin.yml rename to Resources/Prototypes/Body/Organs/vulpkanin.yml diff --git a/Resources/Prototypes/DeltaV/Body/Parts/harpy.yml b/Resources/Prototypes/Body/Parts/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Body/Parts/harpy.yml rename to Resources/Prototypes/Body/Parts/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Body/Parts/vulpkanin.yml b/Resources/Prototypes/Body/Parts/vulpkanin.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Body/Parts/vulpkanin.yml rename to Resources/Prototypes/Body/Parts/vulpkanin.yml diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml b/Resources/Prototypes/Body/Prototypes/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Body/Prototypes/harpy.yml rename to Resources/Prototypes/Body/Prototypes/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml b/Resources/Prototypes/Body/Prototypes/vulpkanin.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Body/Prototypes/vulpkanin.yml rename to Resources/Prototypes/Body/Prototypes/vulpkanin.yml diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 399181b4fab..1d727161af5 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -57,3 +57,53 @@ cost: 5200 category: Armory group: market + +- type: cargoProduct + id: ArmoryGrand + icon: + sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi + state: base + product: CrateArmoryGrand + cost: 5500 + category: Armory + group: market + +- type: cargoProduct + id: ArmoryUniversal + icon: + sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi + state: icon + product: CrateArmoryUniversal + cost: 6500 + category: Armory + group: market + +- type: cargoProduct + id: ArmoryShotgunAdjutant + icon: + sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi + state: icon + product: CrateArmoryAdjutant + cost: 10000 + category: Armory + group: market + +- type: cargoProduct + id: ArmoryEnergyGun + icon: + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi + state: icon + product: CrateArmoryEnergyGun + cost: 5500 + category: Armory + group: market + +- type: cargoProduct + id: ArmoryEnergyGunMini + icon: + sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi + state: icon + product: CrateArmoryEnergyGunMini + cost: 3500 + category: Armory + group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index e5069959296..31bef4e633b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -77,3 +77,33 @@ cost: 2400 category: Food group: market + +- type: cargoProduct + id: FoodCrateKvassTank + icon: + sprite: DeltaV/Structures/Storage/kvass.rsi + state: kvass + product: KvassTankFull + cost: 2000 + category: Food + group: market + +- type: cargoProduct + id: FoodDonkpocketSavory + icon: + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + state: pizza-box + product: CrateFoodDonkpocketSavory + cost: 6000 # Thanks bounties + category: Food + group: market + +- type: cargoProduct + id: FoodDonkpocketSweet + icon: + sprite: Objects/Consumable/Food/Baked/donkpocket.rsi + state: berry-box + product: CrateFoodDonkpocketSweet + cost: 6000 # Thanks bounties + category: Food + group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 2d5acf5c90f..fddfc2ca40b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -198,12 +198,33 @@ category: Fun group: market -#- type: cargoProduct -# id: FunCrateGambling -# icon: -# sprite: Objects/Economy/cash.rsi -# state: cash_1000000 -# product: CrateCargoGambling -# cost: 10000 -# category: Fun -# group: market +- type: cargoProduct + id: FunCrateGambling + icon: + sprite: Objects/Economy/cash.rsi + state: cash_1000000 + product: CrateCargoGambling + cost: 10000 + category: Fun + group: market + +- type: cargoProduct + id: CrateFunBBGun + icon: + sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi + state: display + product: CrateFunBBGun + cost: 1000 + category: Fun + group: market + +- type: cargoProduct + id: CapGunSet + icon: + sprite: Objects/Fun/caps.rsi + state: icon + product: CrateCapGunSet + cost: 1000 + category: Fun + group: market + diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index 6ef0ab4e211..b459abd925d 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -227,3 +227,14 @@ cost: 5000 category: Livestock group: market + +- type: cargoProduct + id: LivestockSecDog + icon: + sprite: DeltaV/Mobs/Pets/secdog.rsi + state: secdog + product: CrateNPCSecDog + cost: 3500 + category: Livestock + group: market + diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index 01a7192b35b..0b3ead4835e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml @@ -147,3 +147,14 @@ cost: 750 category: Medical group: market + +- type: cargoProduct + id: MedicalScrubsCrate + icon: + sprite: Clothing/Uniforms/Scrubs/blue.rsi + state: icon + product: CrateMedicalScrubs + cost: 500 + category: Medical + group: market + diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 6287710182a..ed9474676e3 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -257,3 +257,13 @@ cost: 1200 category: Service group: market + +- type: cargoProduct + id: CrateVendingMachineRestockPride + icon: + sprite: Objects/Specific/Service/vending_machine_restock.rsi + state: base + product: CrateVendingMachineRestockPrideFilled + cost: 1100 + category: Service + group: market diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index cd269d83ddb..79c7ff22beb 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -1,3 +1,5 @@ +# TODO in later PR: Organise this alphabetically or something. Who the fuck made clown backpack like this? + - type: entity parent: ClothingBackpack id: ClothingBackpackFilled @@ -60,6 +62,17 @@ - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded +- type: entity + noSpawn: true + parent: ClothingBackpackMedical + id: ClothingBackpackPsychologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: RubberStampPsychologist + + - type: entity noSpawn: true parent: ClothingBackpackCaptain @@ -136,6 +149,17 @@ - id: BoxSurvivalSecurity - id: Flash - id: MagazinePistol + +- type: entity + noSpawn: true + parent: ClothingBackpack + id: ClothingBackpackLawyerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampLawyer + - type: entity noSpawn: true @@ -192,6 +216,18 @@ contents: - id: BoxSurvivalMedical +- type: entity + noSpawn: true + parent: ClothingBackpackMedical + id: ClothingBackpackParamedicFilledDV # TODO: Take out the stupid DV tag in the ID. + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: EmergencyRollerBedSpawnFolded + - id: BodyBag_Folded + - id: Portafib + - type: entity noSpawn: true parent: ClothingBackpack @@ -237,6 +273,8 @@ - id: HandLabeler - id: BoxForensicPad + + # ERT - type: entity @@ -378,3 +416,19 @@ - id: Cutlass - id: WeaponRevolverPirate - id: ClothingEyesEyepatch + + +# Mafia ? + +- type: entity + parent: ClothingBackpackSatchelLeather + id: ClothingBackpackMafiaFilled + suffix: Filled, Mafia + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: WeaponSubMachineGunTypewriter + - id: WeaponPistolViperWood + - id: MagazinePistol + - id: BaseBallBat diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index f7ad973b842..a72f59eb1ac 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -1,3 +1,5 @@ +# TODO in a later PR: Fix this to be alphabetic. + - type: entity noSpawn: true parent: ClothingBackpackDuffel @@ -42,12 +44,22 @@ - type: entity noSpawn: true - parent: ClothingBackpackDuffelBrigmedic - id: ClothingBackpackDuffelBrigmedicFilled + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelLawyerFilled components: - type: StorageFill contents: - - id: Flash + - id: BoxSurvival + - id: RubberStampLawyer + +#- type: entity +# noSpawn: true +# parent: ClothingBackpackDuffelBrigmedic +# id: ClothingBackpackDuffelBrigmedicFilled +# components: +# - type: StorageFill +# contents: +# - id: Flash - type: entity noSpawn: true @@ -58,6 +70,18 @@ contents: - id: BoxSurvivalMedical +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelMedical + id: ClothingBackpackDuffelParamedicFilledDV # TODO: Just change this to not be dumb. + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: EmergencyRollerBedSpawnFolded + - id: BodyBag_Folded + - id: Portafib + - type: entity noSpawn: true parent: ClothingBackpackDuffelMedical @@ -68,6 +92,16 @@ - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded +- type: entity + noSpawn: true + parent: ClothingBackpackDuffelMedical + id: ClothingBackpackDuffelPsychologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: RubberStampPsychologist + - type: entity noSpawn: true parent: ClothingBackpackDuffelCaptain diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 1a3dda66487..73af771193f 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -1,3 +1,5 @@ +# TODO: in a seperate PR; rearrange this madness into alphabetic order + - type: entity noSpawn: true parent: ClothingBackpackSatchel @@ -54,6 +56,17 @@ - id: ForensicPad - id: ForensicScanner +- type: entity + noSpawn: true + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelLawyerFilled + components: + - type: StorageFill + contents: + - id: BoxSurvival + - id: RubberStampLawyer + + - type: entity noSpawn: true parent: ClothingBackpackSatchelBrigmedic @@ -72,6 +85,28 @@ contents: - id: BoxSurvivalMedical +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelMedical + id: ClothingBackpackSatchelParamedicFilledDV # TODO: Fix this to just be the regular paramedic backpack in a seperate PR + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: EmergencyRollerBedSpawnFolded + - id: BodyBag_Folded + - id: Portafib + +- type: entity + noSpawn: true + parent: ClothingBackpackSatchelMedical + id: ClothingBackpackSatchelPsychologistFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalMedical + - id: RubberStampPsychologist + - type: entity noSpawn: true parent: ClothingBackpackSatchelMedical diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 7840602362f..2e42bf2435b 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -472,3 +472,22 @@ layers: - state: box - state: darts + +- type: entity + name: Prisoner encryption key box + parent: BoxCardboard + id: BoxEncryptionKeyPrisoner + description: A box of spare encryption keys. + components: + - type: StorageFill + contents: + - id: EncryptionKeyPrison + amount: 4 + - type: Sprite + layers: + - state: box + - state: encryptokey + - type: Storage + whitelist: + components: + - EncryptionKey diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml b/Resources/Prototypes/Catalog/Fills/Boxes/pda.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/pda.yml rename to Resources/Prototypes/Catalog/Fills/Boxes/pda.yml diff --git a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml index d5aab237170..41feeede420 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/armory.yml @@ -69,3 +69,55 @@ amount: 2 - id: MagazinePistol amount: 4 + +- type: entity + id: CrateArmoryGrand + parent: CrateWeaponSecure + components: + - type: StorageFill + contents: + - id: WeaponSniperGrand + amount: 2 + - id: BoxSpeedLoaderLightRifle + amount: 1 + +- type: entity + id: CrateArmoryUniversal + parent: CrateWeaponSecure + components: + - type: StorageFill + contents: + - id: WeaponPistolUniversal + amount: 2 + - id: MagazineUniversalMagnum + amount: 4 + +- type: entity + id: CrateArmoryAdjutant + parent: CrateWeaponSecure + components: + - type: StorageFill + contents: + - id: WeaponShotgunAdjutant + amount: 2 + - id: BoxLethalshot + amount: 3 + +- type: entity + id: CrateArmoryEnergyGun + parent: CrateWeaponSecure + components: + - type: StorageFill + contents: + - id: WeaponEnergyGun + amount: 3 + +- type: entity + id: CrateArmoryEnergyGunMini + parent: CrateWeaponSecure + components: + - type: StorageFill + contents: + - id: WeaponEnergyGunMini + amount: 3 + diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 24f380dd2cc..6b7c2510e15 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/food.yml @@ -165,3 +165,34 @@ - id: DrinkFourteenLokoCan amount: 4 +- type: entity + id: CrateFoodDonkpocketSavory + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: FoodBoxDonkpocket + amount: 2 + - id: FoodBoxDonkpocketPizza + amount: 1 + - id: FoodBoxDonkpocketSpicy + amount: 1 + - id: FoodBoxDonkpocketTeriyaki + amount: 1 + - id: FoodBoxDonkpocketDink + prob: 0.1 + +- type: entity + id: CrateFoodDonkpocketSweet + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: FoodBoxDonkpocket + amount: 2 + - id: FoodBoxDonkpocketHonk + amount: 1 + - id: FoodBoxDonkpocketBerry + amount: 1 + - id: FoodBoxDonkpocketDink + prob: 0.1 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 1db0c3121ed..e06fc5569b0 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -348,3 +348,28 @@ amount: 1 prob: 0.05 +- type: entity + id: CrateFunBBGun + parent: CrateGenericSteel + components: + - type: StorageFill + contents: + - id: WeaponRifleBB + amount: 1 + - id: BoxCartridgeBB + amount: 2 + +- type: entity + name: cap gun box set + description: A box filled with fun, harmless cap guns that are sure to keep security entertained and the air smelling of sulfur. + id: CrateCapGunSet + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: RevolverCapGun + amount: 1 + - id: SpeedLoaderCap + amount: 2 + - id: BoxCartridgeCap + amount: 2 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 538eee9a1b1..9906cb99ab1 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -264,3 +264,12 @@ contents: - id: MobMothroach amount: 4 + +- type: entity + id: CrateNPCSecDog + parent: CrateLivestock + components: + - type: StorageFill + contents: + - id: MobSecDog + amount: 1 diff --git a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml index 5a6b5ca089f..b2e57102293 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/vending.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/vending.yml @@ -256,3 +256,11 @@ contents: - id: VendingMachineRestockDonut amount: 2 + +- type: entity + id: CrateVendingMachineRestockPrideFilled + parent: CratePlastic + components: + - type: StorageFill + contents: + - id: VendingMachineRestockPride diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index 976d2a4307f..11d9a6c11ab 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -185,3 +185,27 @@ contents: - id: FoodShakerSalt - id: FoodShakerPepper + +- type: entity + id: ClothingBeltKatanaSheathFilled + parent: ClothingBeltKatanaSheath + suffix: Filled + components: + - type: StorageFill + contents: + - id: Wakizashi + - id: Katana + +- type: entity + id: ClothingBeltCorpsmanWebbingFilled + parent: ClothingBeltCorpsmanWebbing + suffix: Filled + components: + - type: StorageFill + contents: + - id: MedicatedSuture + - id: RegenerativeMesh + - id: Bloodpack + - id: SyringeEphedrine + - id: EmergencyMedipen + diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml index 89376ed4ccf..91b3f3a60a6 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml @@ -295,3 +295,72 @@ contents: - id: WeaponLaserCarbine amount: 3 + +- type: entity + parent: GunSafe + id: GunSafePistolUniversal + name: mk32 safe + components: + - type: StorageFill + contents: + - id: WeaponPistolUniversal + amount: 2 + - id: MagazineUniversalMagnum + amount: 4 + +- type: entity + parent: GunSafe + id: GunSafeSniperGrand + name: mark 1 rifle safe + components: + - type: StorageFill + contents: + - id: WeaponSniperGrand + amount: 2 + - id: SpeedLoaderLightRifle + amount: 4 + +- type: entity + parent: GunSafe + id: GunSafeVulcanRifle + name: vulcan safe + components: + - type: StorageFill + contents: + - id: WeaponRifleVulcan + amount: 2 + - id: MagazineLightRifle + amount: 4 + +- type: entity + parent: GunSafe + id: GunSafeAdjutantShotgun + name: adjutant safe + components: + - type: StorageFill + contents: + - id: WeaponShotgunAdjutant + amount: 2 + - id: MagazineShotgun + amount: 4 + +- type: entity + parent: GunSafe + id: GunSafeEnergyGun + name: energy gun safe + components: + - type: StorageFill + contents: + - id: WeaponEnergyGun + amount: 3 + +- type: entity + parent: GunSafe + id: GunSafeEnergyGunMini + name: miniature energy gun safe + components: + - type: StorageFill + contents: + - id: WeaponEnergyGunMini + amount: 3 + diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/courierdrobe.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/courierdrobe.yml rename to Resources/Prototypes/Catalog/VendingMachines/Advertisements/courierdrobe.yml diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Advertisements/pride.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Catalog/VendingMachines/Advertisements/pride.yml rename to Resources/Prototypes/Catalog/VendingMachines/Advertisements/pride.yml diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/courierdrobe.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/courierdrobe.yml rename to Resources/Prototypes/Catalog/VendingMachines/Inventories/courierdrobe.yml diff --git a/Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Catalog/VendingMachines/Inventories/pride.yml rename to Resources/Prototypes/Catalog/VendingMachines/Inventories/pride.yml diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index f18deb5c0dc..24c0f11c2d6 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -1647,3 +1647,33 @@ conditions: - !type:ListingLimitedStockCondition stock: 1 + +- type: listing + id: Mouse Operative Reinforcement + name: uplink-reinforcement-radio-nukie-mouse-name + description: uplink-reinforcement-radio-nukie-mouse-desc + productEntity: ReinforcementRadioSyndicateNukieMouse + icon: { sprite: DeltaV/Objects/Devices/communication.rsi, state: cheese-radio } + cost: + Telecrystal: 3 + categories: + - UplinkUtility + +- type: listing + id: UplinkBionicSyrinxImplanter + name: uplink-bionic-syrinx-implanter-name + description: uplink-bionic-syrinx-implanter-desc + productEntity: BionicSyrinxImplanter + cost: + Telecrystal: 2 + categories: + - UplinkImplants + conditions: + - !type:BuyerSpeciesCondition + whitelist: + - Harpy + - !type:BuyerWhitelistCondition + blacklist: + components: + - SurplusBundle + diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 31dd47a9e16..195aac1fc3c 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -336,3 +336,15 @@ flatReductions: # can't punch the endoskeleton to death Blunt: 5 + +- type: damageModifierSet + id: Vulpkanin + coefficients: + Heat: 1.15 + +- type: damageModifierSet + id: Harpy + coefficients: + Blunt: 1.15 + Slash: 1.15 + Piercing: 1.15 diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_female.yml b/Resources/Prototypes/Datasets/Names/vulpkanin_female.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_female.yml rename to Resources/Prototypes/Datasets/Names/vulpkanin_female.yml diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_last.yml b/Resources/Prototypes/Datasets/Names/vulpkanin_last.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_last.yml rename to Resources/Prototypes/Datasets/Names/vulpkanin_last.yml diff --git a/Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_male.yml b/Resources/Prototypes/Datasets/Names/vulpkanin_male.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Datasets/Names/vulpkanin_male.yml rename to Resources/Prototypes/Datasets/Names/vulpkanin_male.yml diff --git a/Resources/Prototypes/DeltaV/Accents/word_replacements.yml b/Resources/Prototypes/DeltaV/Accents/word_replacements.yml deleted file mode 100644 index 2e6a52bbee3..00000000000 --- a/Resources/Prototypes/DeltaV/Accents/word_replacements.yml +++ /dev/null @@ -1,166 +0,0 @@ -- type: accent - id: scottish - wordReplacements: - accent-scottish-words-1: accent-scottish-words-replace-1 - accent-scottish-words-2: accent-scottish-words-replace-2 - accent-scottish-words-3: accent-scottish-words-replace-3 - accent-scottish-words-4: accent-scottish-words-replace-4 - accent-scottish-words-5: accent-scottish-words-replace-5 - accent-scottish-words-6: accent-scottish-words-replace-6 - accent-scottish-words-7: accent-scottish-words-replace-7 - accent-scottish-words-8: accent-scottish-words-replace-8 - accent-scottish-words-9: accent-scottish-words-replace-9 - accent-scottish-words-10: accent-scottish-words-replace-10 - accent-scottish-words-11: accent-scottish-words-replace-11 - accent-scottish-words-12: accent-scottish-words-replace-12 - accent-scottish-words-13: accent-scottish-words-replace-13 - accent-scottish-words-14: accent-scottish-words-replace-14 - accent-scottish-words-15: accent-scottish-words-replace-15 - accent-scottish-words-16: accent-scottish-words-replace-16 - accent-scottish-words-17: accent-scottish-words-replace-17 - accent-scottish-words-18: accent-scottish-words-replace-18 - accent-scottish-words-19: accent-scottish-words-replace-19 - accent-scottish-words-20: accent-scottish-words-replace-20 - accent-scottish-words-21: accent-scottish-words-replace-21 - accent-scottish-words-22: accent-scottish-words-replace-22 - accent-scottish-words-23: accent-scottish-words-replace-23 - accent-scottish-words-24: accent-scottish-words-replace-24 - accent-scottish-words-25: accent-scottish-words-replace-25 - accent-scottish-words-26: accent-scottish-words-replace-26 - accent-scottish-words-27: accent-scottish-words-replace-27 - accent-scottish-words-28: accent-scottish-words-replace-28 - accent-scottish-words-29: accent-scottish-words-replace-29 - accent-scottish-words-30: accent-scottish-words-replace-30 - accent-scottish-words-31: accent-scottish-words-replace-31 - accent-scottish-words-32: accent-scottish-words-replace-32 - accent-scottish-words-33: accent-scottish-words-replace-33 - accent-scottish-words-34: accent-scottish-words-replace-34 - accent-scottish-words-35: accent-scottish-words-replace-35 - accent-scottish-words-36: accent-scottish-words-replace-36 - accent-scottish-words-37: accent-scottish-words-replace-37 - accent-scottish-words-38: accent-scottish-words-replace-38 - accent-scottish-words-39: accent-scottish-words-replace-39 - accent-scottish-words-40: accent-scottish-words-replace-40 - accent-scottish-words-41: accent-scottish-words-replace-41 - accent-scottish-words-42: accent-scottish-words-replace-42 - accent-scottish-words-43: accent-scottish-words-replace-43 - accent-scottish-words-44: accent-scottish-words-replace-44 - accent-scottish-words-45: accent-scottish-words-replace-45 - accent-scottish-words-46: accent-scottish-words-replace-46 - accent-scottish-words-47: accent-scottish-words-replace-47 - accent-scottish-words-48: accent-scottish-words-replace-48 - accent-scottish-words-49: accent-scottish-words-replace-49 - accent-scottish-words-50: accent-scottish-words-replace-50 - accent-scottish-words-51: accent-scottish-words-replace-51 - accent-scottish-words-52: accent-scottish-words-replace-52 - accent-scottish-words-53: accent-scottish-words-replace-53 - accent-scottish-words-54: accent-scottish-words-replace-54 - accent-scottish-words-55: accent-scottish-words-replace-55 - accent-scottish-words-56: accent-scottish-words-replace-56 - accent-scottish-words-57: accent-scottish-words-replace-57 - accent-scottish-words-58: accent-scottish-words-replace-58 - accent-scottish-words-59: accent-scottish-words-replace-59 - accent-scottish-words-60: accent-scottish-words-replace-60 - accent-scottish-words-61: accent-scottish-words-replace-61 - accent-scottish-words-62: accent-scottish-words-replace-62 - accent-scottish-words-63: accent-scottish-words-replace-63 - accent-scottish-words-64: accent-scottish-words-replace-64 - accent-scottish-words-65: accent-scottish-words-replace-65 - accent-scottish-words-66: accent-scottish-words-replace-66 - accent-scottish-words-67: accent-scottish-words-replace-67 - accent-scottish-words-68: accent-scottish-words-replace-68 - accent-scottish-words-69: accent-scottish-words-replace-69 - accent-scottish-words-70: accent-scottish-words-replace-70 - accent-scottish-words-71: accent-scottish-words-replace-71 - accent-scottish-words-72: accent-scottish-words-replace-72 - accent-scottish-words-73: accent-scottish-words-replace-73 - accent-scottish-words-74: accent-scottish-words-replace-74 - accent-scottish-words-75: accent-scottish-words-replace-75 - accent-scottish-words-76: accent-scottish-words-replace-76 - accent-scottish-words-77: accent-scottish-words-replace-77 - accent-scottish-words-78: accent-scottish-words-replace-78 - accent-scottish-words-79: accent-scottish-words-replace-79 - accent-scottish-words-80: accent-scottish-words-replace-80 - accent-scottish-words-81: accent-scottish-words-replace-81 - accent-scottish-words-82: accent-scottish-words-replace-82 - accent-scottish-words-83: accent-scottish-words-replace-83 - accent-scottish-words-84: accent-scottish-words-replace-84 - accent-scottish-words-85: accent-scottish-words-replace-85 - accent-scottish-words-86: accent-scottish-words-replace-86 - accent-scottish-words-87: accent-scottish-words-replace-87 - accent-scottish-words-88: accent-scottish-words-replace-88 - accent-scottish-words-89: accent-scottish-words-replace-89 - accent-scottish-words-90: accent-scottish-words-replace-90 - accent-scottish-words-91: accent-scottish-words-replace-91 - accent-scottish-words-92: accent-scottish-words-replace-92 - accent-scottish-words-93: accent-scottish-words-replace-93 - accent-scottish-words-94: accent-scottish-words-replace-94 - accent-scottish-words-95: accent-scottish-words-replace-95 - accent-scottish-words-96: accent-scottish-words-replace-96 - accent-scottish-words-97: accent-scottish-words-replace-97 - accent-scottish-words-98: accent-scottish-words-replace-98 - accent-scottish-words-99: accent-scottish-words-replace-99 - accent-scottish-words-100: accent-scottish-words-replace-100 - accent-scottish-words-101: accent-scottish-words-replace-101 - accent-scottish-words-102: accent-scottish-words-replace-102 - accent-scottish-words-103: accent-scottish-words-replace-103 - accent-scottish-words-104: accent-scottish-words-replace-104 - accent-scottish-words-105: accent-scottish-words-replace-105 - accent-scottish-words-106: accent-scottish-words-replace-106 - accent-scottish-words-107: accent-scottish-words-replace-107 - accent-scottish-words-108: accent-scottish-words-replace-108 - accent-scottish-words-109: accent-scottish-words-replace-109 - accent-scottish-words-110: accent-scottish-words-replace-110 - accent-scottish-words-111: accent-scottish-words-replace-111 - accent-scottish-words-112: accent-scottish-words-replace-112 - accent-scottish-words-113: accent-scottish-words-replace-113 - accent-scottish-words-114: accent-scottish-words-replace-114 - accent-scottish-words-115: accent-scottish-words-replace-115 - accent-scottish-words-116: accent-scottish-words-replace-116 - accent-scottish-words-117: accent-scottish-words-replace-117 - accent-scottish-words-118: accent-scottish-words-replace-118 - accent-scottish-words-119: accent-scottish-words-replace-119 - accent-scottish-words-120: accent-scottish-words-replace-120 - accent-scottish-words-121: accent-scottish-words-replace-121 - accent-scottish-words-122: accent-scottish-words-replace-122 - accent-scottish-words-123: accent-scottish-words-replace-123 - accent-scottish-words-124: accent-scottish-words-replace-124 - accent-scottish-words-125: accent-scottish-words-replace-125 - accent-scottish-words-126: accent-scottish-words-replace-126 - accent-scottish-words-127: accent-scottish-words-replace-127 - accent-scottish-words-128: accent-scottish-words-replace-128 - accent-scottish-words-129: accent-scottish-words-replace-129 - accent-scottish-words-130: accent-scottish-words-replace-130 - accent-scottish-words-131: accent-scottish-words-replace-131 - accent-scottish-words-132: accent-scottish-words-replace-132 - accent-scottish-words-133: accent-scottish-words-replace-133 - accent-scottish-words-134: accent-scottish-words-replace-134 - accent-scottish-words-135: accent-scottish-words-replace-135 - accent-scottish-words-136: accent-scottish-words-replace-136 - accent-scottish-words-137: accent-scottish-words-replace-137 - accent-scottish-words-138: accent-scottish-words-replace-138 - accent-scottish-words-139: accent-scottish-words-replace-139 - accent-scottish-words-140: accent-scottish-words-replace-140 - accent-scottish-words-141: accent-scottish-words-replace-141 - accent-scottish-words-142: accent-scottish-words-replace-142 - accent-scottish-words-143: accent-scottish-words-replace-143 - accent-scottish-words-144: accent-scottish-words-replace-144 - accent-scottish-words-145: accent-scottish-words-replace-145 - accent-scottish-words-146: accent-scottish-words-replace-146 - accent-scottish-words-147: accent-scottish-words-replace-147 - accent-scottish-words-148: accent-scottish-words-replace-148 - accent-scottish-words-149: accent-scottish-words-replace-149 - accent-scottish-words-150: accent-scottish-words-replace-150 - accent-scottish-words-151: accent-scottish-words-replace-151 - accent-scottish-words-152: accent-scottish-words-replace-152 - accent-scottish-words-153: accent-scottish-words-replace-153 - accent-scottish-words-154: accent-scottish-words-replace-154 - accent-scottish-words-155: accent-scottish-words-replace-155 - accent-scottish-words-156: accent-scottish-words-replace-156 - accent-scottish-words-157: accent-scottish-words-replace-157 - accent-scottish-words-158: accent-scottish-words-replace-158 - accent-scottish-words-159: accent-scottish-words-replace-159 - accent-scottish-words-160: accent-scottish-words-replace-160 - accent-scottish-words-161: accent-scottish-words-replace-161 - accent-scottish-words-162: accent-scottish-words-replace-162 - accent-scottish-words-163: accent-scottish-words-replace-163 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Access/cargo.yml b/Resources/Prototypes/DeltaV/Access/cargo.yml deleted file mode 100644 index 72ba1da7850..00000000000 --- a/Resources/Prototypes/DeltaV/Access/cargo.yml +++ /dev/null @@ -1,3 +0,0 @@ -- type: accessLevel - id: Orders - name: id-card-access-level-orders # Custom access level that allows the approval of orders diff --git a/Resources/Prototypes/DeltaV/Access/epistemics.yml b/Resources/Prototypes/DeltaV/Access/epistemics.yml deleted file mode 100644 index 8ccee35e709..00000000000 --- a/Resources/Prototypes/DeltaV/Access/epistemics.yml +++ /dev/null @@ -1,3 +0,0 @@ -- type: accessLevel - id: Mantis - name: id-card-access-level-mantis # Custom access level for the Mantis so they can have their own locker and maybe doors diff --git a/Resources/Prototypes/DeltaV/Access/medical.yml b/Resources/Prototypes/DeltaV/Access/medical.yml deleted file mode 100644 index 326f602210e..00000000000 --- a/Resources/Prototypes/DeltaV/Access/medical.yml +++ /dev/null @@ -1,3 +0,0 @@ -- type: accessLevel - id: Psychologist - name: id-card-access-level-psychologist diff --git a/Resources/Prototypes/DeltaV/Access/misc.yml b/Resources/Prototypes/DeltaV/Access/misc.yml deleted file mode 100644 index c1260b39958..00000000000 --- a/Resources/Prototypes/DeltaV/Access/misc.yml +++ /dev/null @@ -1,48 +0,0 @@ -- type: accessLevel - id: DV-SpareSafe - name: id-card-access-level-unused - -- type: accessGroup - id: AllAccessBorg - tags: -# - EmergencyShuttleRepealAll -# - Captain -# - HeadOfPersonnel -# - ChiefEngineer -# - ChiefMedicalOfficer -# - HeadOfSecurity -# - ResearchDirector - - Command - - Security - - Detective -# - Armory - - Lawyer - - Engineering - - Medical -# - Quartermaster - - Salvage - - Cargo - - Research - - Service - - Maintenance - - External - - Janitor - - Theatre - - Bar - - Chemistry - - Kitchen - - Chapel - - Hydroponics - - Atmospherics - - Mail -# - Orders - - Mantis - - Paramedic - - Psychologist - - Boxer - - Clown - - Library - - Mime - - Musician - - Reporter - - Zookeeper diff --git a/Resources/Prototypes/DeltaV/Access/service.yml b/Resources/Prototypes/DeltaV/Access/service.yml deleted file mode 100644 index 9416a165fe1..00000000000 --- a/Resources/Prototypes/DeltaV/Access/service.yml +++ /dev/null @@ -1,27 +0,0 @@ -- type: accessLevel - id: Boxer - name: id-card-access-level-boxer - -- type: accessLevel - id: Clown - name: id-card-access-level-clown - -- type: accessLevel - id: Library - name: id-card-access-level-library - -- type: accessLevel - id: Mime - name: id-card-access-level-mime - -- type: accessLevel - id: Musician - name: id-card-access-level-musician - -- type: accessLevel - id: Reporter - name: id-card-access-level-reporter - -- type: accessLevel - id: Zookeeper - name: id-card-access-level-zookeeper diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml deleted file mode 100644 index 1dae88730c1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml +++ /dev/null @@ -1,49 +0,0 @@ -- type: cargoProduct - id: ArmoryGrand - icon: - sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi - state: base - product: CrateArmoryGrand - cost: 5500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryUniversal - icon: - sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi - state: icon - product: CrateArmoryUniversal - cost: 6500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryShotgunAdjutant - icon: - sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi - state: icon - product: CrateArmoryAdjutant - cost: 10000 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryEnergyGun - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi - state: icon - product: CrateArmoryEnergyGun - cost: 5500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryEnergyGunMini - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi - state: icon - product: CrateArmoryEnergyGunMini - cost: 3500 - category: Armory - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml deleted file mode 100644 index 42b4d57e910..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: cargoProduct - id: FoodCrateKvassTank - icon: - sprite: DeltaV/Structures/Storage/kvass.rsi - state: kvass - product: KvassTankFull - cost: 2000 - category: Food - group: market - -- type: cargoProduct - id: FoodDonkpocketSavory - icon: - sprite: Objects/Consumable/Food/Baked/donkpocket.rsi - state: pizza-box - product: CrateFoodDonkpocketSavory - cost: 6000 # Thanks bounties - category: Food - group: market - -- type: cargoProduct - id: FoodDonkpocketSweet - icon: - sprite: Objects/Consumable/Food/Baked/donkpocket.rsi - state: berry-box - product: CrateFoodDonkpocketSweet - cost: 6000 # Thanks bounties - category: Food - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml deleted file mode 100644 index ddf3ebdb9e1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: cargoProduct - id: CrateFunBBGun - icon: - sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi - state: display - product: CrateFunBBGun - cost: 1000 - category: Fun - group: market - -- type: cargoProduct - id: CapGunSet - icon: - sprite: Objects/Fun/caps.rsi - state: icon - product: CrateCapGunSet - cost: 1000 - category: Fun - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml deleted file mode 100644 index c025efd4f6a..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: LivestockSecDog - icon: - sprite: DeltaV/Mobs/Pets/secdog.rsi - state: secdog - product: CrateNPCSecDog - cost: 3500 - category: Livestock - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml deleted file mode 100644 index 503fb675ff1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: MedicalScrubsCrate - icon: - sprite: Clothing/Uniforms/Scrubs/blue.rsi - state: icon - product: CrateMedicalScrubs - cost: 500 - category: Medical - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml deleted file mode 100644 index 343ec4d5333..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: CrateVendingMachineRestockPride - icon: - sprite: Objects/Specific/Service/vending_machine_restock.rsi - state: base - product: CrateVendingMachineRestockPrideFilled - cost: 1100 - category: Service - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml deleted file mode 100644 index 1f27eb265c2..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: entity - parent: ClothingBackpackSatchelLeather - id: ClothingBackpackMafiaFilled - suffix: Filled, Mafia - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: WeaponSubMachineGunTypewriter - - id: WeaponPistolViperWood - - id: MagazinePistol - - id: BaseBallBat - -- type: entity - noSpawn: true - parent: ClothingBackpackMedical - id: ClothingBackpackParamedicFilledDV - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded - - id: Portafib - -- type: entity - noSpawn: true - parent: ClothingBackpackMedical - id: ClothingBackpackPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist - - -- type: entity - noSpawn: true - parent: ClothingBackpack - id: ClothingBackpackLawyerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampLawyer diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml deleted file mode 100644 index 0ae8407a2fc..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ /dev/null @@ -1,32 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelMedical - id: ClothingBackpackDuffelParamedicFilledDV - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded - - id: Portafib - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelMedical - id: ClothingBackpackDuffelPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist - - -- type: entity - noSpawn: true - parent: ClothingBackpackDuffel - id: ClothingBackpackDuffelLawyerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampLawyer diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml deleted file mode 100644 index 4eebbcfe917..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ /dev/null @@ -1,32 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelMedical - id: ClothingBackpackSatchelParamedicFilledDV - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded - - id: Portafib - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelMedical - id: ClothingBackpackSatchelPsychologistFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalMedical - - id: RubberStampPsychologist - - -- type: entity - noSpawn: true - parent: ClothingBackpackSatchel - id: ClothingBackpackSatchelLawyerFilled - components: - - type: StorageFill - contents: - - id: BoxSurvival - - id: RubberStampLawyer diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml deleted file mode 100644 index 804a4727ee3..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Boxes/general.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - name: Prisoner encryption key box - parent: BoxCardboard - id: BoxEncryptionKeyPrisoner - description: A box of spare encryption keys. - components: - - type: StorageFill - contents: - - id: EncryptionKeyPrison - amount: 4 - - type: Sprite - layers: - - state: box - - state: encryptokey - - type: Storage - whitelist: - components: - - EncryptionKey diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml deleted file mode 100644 index a321cdf059c..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: entity - id: CrateArmoryGrand - parent: CrateWeaponSecure - components: - - type: StorageFill - contents: - - id: WeaponSniperGrand - amount: 2 - - id: BoxSpeedLoaderLightRifle - amount: 1 - -- type: entity - id: CrateArmoryUniversal - parent: CrateWeaponSecure - components: - - type: StorageFill - contents: - - id: WeaponPistolUniversal - amount: 2 - - id: MagazineUniversalMagnum - amount: 4 - -- type: entity - id: CrateArmoryAdjutant - parent: CrateWeaponSecure - components: - - type: StorageFill - contents: - - id: WeaponShotgunAdjutant - amount: 2 - - id: BoxLethalshot - amount: 3 - -- type: entity - id: CrateArmoryEnergyGun - parent: CrateWeaponSecure - components: - - type: StorageFill - contents: - - id: WeaponEnergyGun - amount: 3 - -- type: entity - id: CrateArmoryEnergyGunMini - parent: CrateWeaponSecure - components: - - type: StorageFill - contents: - - id: WeaponEnergyGunMini - amount: 3 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml deleted file mode 100644 index 6e273a72c48..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/food.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: entity - id: CrateFoodDonkpocketSavory - parent: CratePlastic - components: - - type: StorageFill - contents: - - id: FoodBoxDonkpocket - amount: 2 - - id: FoodBoxDonkpocketPizza - amount: 1 - - id: FoodBoxDonkpocketSpicy - amount: 1 - - id: FoodBoxDonkpocketTeriyaki - amount: 1 - - id: FoodBoxDonkpocketDink - prob: 0.1 - -- type: entity - id: CrateFoodDonkpocketSweet - parent: CratePlastic - components: - - type: StorageFill - contents: - - id: FoodBoxDonkpocket - amount: 2 - - id: FoodBoxDonkpocketHonk - amount: 1 - - id: FoodBoxDonkpocketBerry - amount: 1 - - id: FoodBoxDonkpocketDink - prob: 0.1 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml deleted file mode 100644 index 18185d975e3..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/fun.yml +++ /dev/null @@ -1,25 +0,0 @@ -- type: entity - id: CrateFunBBGun - parent: CrateGenericSteel - components: - - type: StorageFill - contents: - - id: WeaponRifleBB - amount: 1 - - id: BoxCartridgeBB - amount: 2 - -- type: entity - name: cap gun box set - description: A box filled with fun, harmless cap guns that are sure to keep security entertained and the air smelling of sulfur. - id: CrateCapGunSet - parent: CratePlastic - components: - - type: StorageFill - contents: - - id: RevolverCapGun - amount: 1 - - id: SpeedLoaderCap - amount: 2 - - id: BoxCartridgeCap - amount: 2 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/npc.yml deleted file mode 100644 index b628a03e7f4..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/npc.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: entity - id: CrateNPCSecDog - parent: CrateLivestock - components: - - type: StorageFill - contents: - - id: MobSecDog - amount: 1 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml deleted file mode 100644 index 985b0443e2b..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/vending.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: entity - id: CrateVendingMachineRestockPrideFilled - parent: CratePlastic - components: - - type: StorageFill - contents: - - id: VendingMachineRestockPride \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml deleted file mode 100644 index ecffae4c361..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Items/Belts/belts.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: entity - id: ClothingBeltKatanaSheathFilled - parent: ClothingBeltKatanaSheath - suffix: Filled - components: - - type: StorageFill - contents: - - id: Wakizashi - - id: Katana - -- type: entity - id: ClothingBeltCorpsmanWebbingFilled - parent: ClothingBeltCorpsmanWebbing - suffix: Filled - components: - - type: StorageFill - contents: - - id: MedicatedSuture - - id: RegenerativeMesh - - id: Bloodpack - - id: SyringeEphedrine - - id: EmergencyMedipen diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml deleted file mode 100644 index 50ba7cc6a6f..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Lockers/security.yml +++ /dev/null @@ -1,67 +0,0 @@ -- type: entity - parent: GunSafe - id: GunSafePistolUniversal - name: mk32 safe - components: - - type: StorageFill - contents: - - id: WeaponPistolUniversal - amount: 2 - - id: MagazineUniversalMagnum - amount: 4 - -- type: entity - parent: GunSafe - id: GunSafeSniperGrand - name: mark 1 rifle safe - components: - - type: StorageFill - contents: - - id: WeaponSniperGrand - amount: 2 - - id: SpeedLoaderLightRifle - amount: 4 - -- type: entity - parent: GunSafe - id: GunSafeVulcanRifle - name: vulcan safe - components: - - type: StorageFill - contents: - - id: WeaponRifleVulcan - amount: 2 - - id: MagazineLightRifle - amount: 4 - -- type: entity - parent: GunSafe - id: GunSafeAdjutantShotgun - name: adjutant safe - components: - - type: StorageFill - contents: - - id: WeaponShotgunAdjutant - amount: 2 - - id: MagazineShotgun - amount: 4 - -- type: entity - parent: GunSafe - id: GunSafeEnergyGun - name: energy gun safe - components: - - type: StorageFill - contents: - - id: WeaponEnergyGun - amount: 3 - -- type: entity - parent: GunSafe - id: GunSafeEnergyGunMini - name: miniature energy gun safe - components: - - type: StorageFill - contents: - - id: WeaponEnergyGunMini - amount: 3 diff --git a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml b/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml deleted file mode 100644 index ca0e83d45a3..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml +++ /dev/null @@ -1,28 +0,0 @@ -- type: listing - id: Mouse Operative Reinforcement - name: uplink-reinforcement-radio-nukie-mouse-name - description: uplink-reinforcement-radio-nukie-mouse-desc - productEntity: ReinforcementRadioSyndicateNukieMouse - icon: { sprite: DeltaV/Objects/Devices/communication.rsi, state: cheese-radio } - cost: - Telecrystal: 3 - categories: - - UplinkUtility - -- type: listing - id: UplinkBionicSyrinxImplanter - name: uplink-bionic-syrinx-implanter-name - description: uplink-bionic-syrinx-implanter-desc - productEntity: BionicSyrinxImplanter - cost: - Telecrystal: 2 - categories: - - UplinkImplants - conditions: - - !type:BuyerSpeciesCondition - whitelist: - - Harpy - - !type:BuyerWhitelistCondition - blacklist: - components: - - SurplusBundle diff --git a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml b/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml deleted file mode 100644 index a2b8be8bf6a..00000000000 --- a/Resources/Prototypes/DeltaV/Damage/modifier_sets.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: damageModifierSet - id: Vulpkanin - coefficients: - Heat: 1.15 - -- type: damageModifierSet - id: Harpy - coefficients: - Blunt: 1.15 - Slash: 1.15 - Piercing: 1.15 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml deleted file mode 100644 index 37b4a65d98d..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/backpacks.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackBrigmedic - id: ClothingBackpackBrigmedicDeltaVFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded - - id: Portafib - # - id: Flash - - id: BruteAutoInjector - amount: 2 - - id: BurnAutoInjector - amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml deleted file mode 100644 index 2ab94da0a4b..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/duffelbag.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackDuffelBrigmedic - id: ClothingBackpackDuffelBrigmedicDeltaVFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded - - id: Portafib - # - id: Flash - - id: BruteAutoInjector - amount: 2 - - id: BurnAutoInjector - amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml deleted file mode 100644 index d2d081da462..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Back/backpacks.yml/satchel.yml +++ /dev/null @@ -1,16 +0,0 @@ -- type: entity - noSpawn: true - parent: ClothingBackpackSatchelBrigmedic - id: ClothingBackpackSatchelBrigmedicDeltaVFilled - components: - - type: StorageFill - contents: - - id: BoxSurvivalSecurity - - id: EmergencyRollerBedSpawnFolded - - id: BodyBag_Folded - - id: Portafib - # - id: Flash - - id: BruteAutoInjector - amount: 2 - - id: BurnAutoInjector - amount: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml deleted file mode 100644 index 50bd612b633..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Belt/belts.yml +++ /dev/null @@ -1,66 +0,0 @@ -- type: entity - parent: ClothingBeltStorageBase - id: ClothingBeltCeremonial - name: ceremonial belt - description: A blue-and-white belt with assorted pockets and pouches. - components: - - type: Sprite - sprite: DeltaV/Clothing/Belt/ceremonial.rsi - - type: Clothing - sprite: DeltaV/Clothing/Belt/ceremonial.rsi - - type: Storage - whitelist: - tags: - - CigPack - - Taser - - SecBeltEquip - - Radio - - Flashlight - components: - - Stunbaton - - FlashOnTrigger - - Flash - - Handcuff - - BallisticAmmoProvider - - Ammo - - PowerCell - - OnUseTimerTrigger - - type: ItemMapper - mapLayers: - flashbang: - whitelist: - components: - - FlashOnTrigger - stunbaton: - whitelist: - components: - - Stunbaton - sprite: Clothing/Belt/belt_overlay.rsi - - type: Appearance - -- type: entity - parent: ClothingBeltBase - id: ClothingBeltSuspendersBlack - name: suspenders - description: For holding your pants up. - components: - - type: Sprite - sprite: DeltaV/Clothing/Belt/suspendersblack.rsi - state: icon - - type: Clothing - sprite: DeltaV/Clothing/Belt/suspendersblack.rsi - quickEquip: true - - type: Tag - tags: - - BeltSlotNotBelt - -- type: entity - parent: ClothingBeltStorageBase - id: ClothingBeltCorpsmanWebbing - name: corpsman webbing - description: A set of security webbing with blue corpsman highlights. - components: - - type: Sprite - sprite: DeltaV/Clothing/Belt/corpsman.rsi - - type: Clothing - sprite: DeltaV/Clothing/Belt/corpsman.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml deleted file mode 100644 index c65dd62312f..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Ears/headsets.yml +++ /dev/null @@ -1,77 +0,0 @@ -- type: entity - parent: ClothingHeadsetService - id: ClothingHeadsetHoP - name: hop headset - description: A headset used by the head of personnel. - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeyService - - EncryptionKeyCommand - - EncryptionKeyCommon - -- type: entity - parent: ClothingHeadsetAlt - id: ClothingHeadsetAltService - name: head of personnel's over-ear headset - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeyService - - EncryptionKeyCommand - - EncryptionKeyCommon - - type: Sprite - sprite: DeltaV/Clothing/Ears/Headsets/service.rsi - - type: Clothing - sprite: DeltaV/Clothing/Ears/Headsets/service.rsi - -- type: entity - parent: ClothingHeadsetAltSyndicate - id: ClothingHeadsetAltSyndicateListening - name: blood-red over-ear interception headset - description: An advanced, modular syndicate interception intercom that fits over the head. - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeySyndie - - EncryptionKeyStationMaster - - type: Sprite - sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi - - type: Clothing - sprite: DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi - -- type: entity - parent: ClothingHeadset - id: ClothingHeadsetPrison - name: prison headset - description: Headset used by anybody who needs direct contact with prisoners - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeyPrison - - EncryptionKeyCommon - - type: Sprite - sprite: DeltaV/Clothing/Ears/Headsets/prisoner.rsi - - type: Clothing - sprite: DeltaV/Clothing/Ears/Headsets/prisoner.rsi - -- type: entity - parent: ClothingHeadset - id: ClothingHeadsetPrisonGuard - name: guard headset - description: Headset used by prison guards. - components: - - type: ContainerFill - containers: - key_slots: - - EncryptionKeyPrison - - EncryptionKeyCommon - - EncryptionKeySecurity - - type: Sprite - sprite: Clothing/Ears/Headsets/security.rsi - - type: Clothing - sprite: Clothing/Ears/Headsets/security.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml deleted file mode 100644 index 8642867effd..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/glasses.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: ClothingEyesBase - id: ClothingEyesGlassesChemist - name: safety glasses - description: Glasses made for chemists and other workers dealing with caustic reagents. - components: - - type: Sprite - sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi - - type: Clothing - sprite: DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi - - type: Armor - modifiers: - coefficients: - Caustic: 0.85 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml deleted file mode 100644 index a959b64a381..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Eyes/hud.yml +++ /dev/null @@ -1,58 +0,0 @@ -- type: entity - parent: ClothingEyesBase - id: ClothingEyesPrescriptionMedHud - name: prescription medical hud - description: A poorly done and rushed mix between half of a pair of prescription glasses and a medical HUD allowing you to see clearly out of one eye and view the health of people out of the other! - components: - - type: Sprite - sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi - - type: Clothing - sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi - - type: Construction - graph: PrescriptionMedHud - node: prescmedhud - - type: ShowHealthBars - damageContainers: - - Biological - - type: ShowHealthIcons - damageContainers: - - Biological - - type: Tag - tags: - - HudMedical - - GlassesNearsight - -- type: entity - parent: ClothingEyesBase - id: ClothingEyesPrescriptionHudSecurity - name: prescription security hud - description: A poorly done and rushed mix between half of a pair of prescription glasses and a security HUD allowing you to see clearly out of one eye and inspect the employee's ID and warning status in the other! - components: - - type: Sprite - sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi - - type: Clothing - sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi - - type: ShowSecurityIcons - - type: Construction - graph: PrescriptionSecHud - node: prescsechud - - type: Tag - tags: - - HudSecurity - - GlassesNearsight - -- type: entity - parent: ClothingEyesBase - id: ClothingEyesHudSyndicateMed - name: syndicate medical visor - description: An upgraded syndicate visor with automatic health readings, designed for better detection of humanoids and their subsequent elimination. - components: - - type: Sprite - sprite: DeltaV/Clothing/Eyes/Hud/syndmed.rsi - - type: Clothing - sprite: DeltaV/Clothing/Eyes/Hud/syndmed.rsi - - type: ShowSyndicateIcons - - type: ShowSecurityIcons - - type: ShowHealthBars - damageContainers: - - Biological diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml deleted file mode 100644 index 1dc8942c097..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Hands/gloves.yml +++ /dev/null @@ -1,63 +0,0 @@ -- type: entity - parent: ClothingHandsBase - id: ClothingHandsGlovesInspection - name: inspection gloves - description: A fancy pair of white gloves, both durable and delicate. - components: - - type: Sprite - sprite: DeltaV/Clothing/Hands/Gloves/inspection.rsi - - type: Clothing - sprite: DeltaV/Clothing/Hands/Gloves/inspection.rsi - - type: GloveHeatResistance - heatResistance: 1400 - - type: Insulated - - type: Fiber - fiberMaterial: fibers-leather - fiberColor: fibers-white - - type: FingerprintMask - -- type: entity - parent: ClothingHandsBase - id: ClothingHandsGlovesRyuzoGauntlets - name: golden gauntlets - description: Because sometimes, things just need to be based on your fists. - suffix: ADMIN ONLY, DO NOT MAP - components: - - type: Sprite - sprite: DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi - - type: Clothing - sprite: DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi - - type: GloveHeatResistance - heatResistance: 1400 - - type: Insulated - - type: Fiber - fiberMaterial: fibers-leather - fiberColor: fibers-white - - type: FingerprintMask - - type: StaminaDamageOnHit - damage: 20 - - type: MeleeWeapon - attackRate: 1.5 - damage: - types: - Blunt: 9.5 - -- type: entity - parent: ClothingHandsBase - id: ClothingHandsGlovesChemist - name: heavy nitrile gloves - description: A pair of thick gloves that provide some protection from caustic chemicals. - components: - - type: Sprite - sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi - - type: Clothing - sprite: DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi - - type: Fiber - fiberMaterial: fibers-rubber - fiberColor: fibers-black - - type: Armor - modifiers: - coefficients: - Caustic: 0.95 - - type: TemperatureProtection - coefficient: 1 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml deleted file mode 100644 index bdef8822cc5..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hardsuit-helmets.yml +++ /dev/null @@ -1,141 +0,0 @@ -# Standard Combat Hardsuits -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitCombatStandard - noSpawn: true - name: combat hardsuit helmet - description: An armoured helmet with a yellow visor and dual head-mounted lights. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.50 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.90 - Slash: 0.90 - Piercing: 0.90 - Heat: 0.90 - -- type: entity - parent: ClothingHeadHelmetHardsuitCombatStandard - id: ClothingHeadHelmetHardsuitCombatOfficer - name: security combat hardsuit helmet - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi - -# Medical Combat Hardsuits -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitCombatMedical - noSpawn: true - name: medical combat hardsuit helmet - description: A lightweight armoured helmet with full-face blue visor and head-mounted light. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi - - type: PointLight - color: "#00FFFF" - - type: PressureProtection - highPressureMultiplier: 0.60 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.95 - Slash: 0.95 - Piercing: 0.95 - Heat: 0.95 - -- type: entity - parent: ClothingHeadHelmetHardsuitCombatMedical - id: ClothingHeadHelmetHardsuitCombatCorpsman - name: corpsman combat hardsuit helmet - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi - -# Riot Combat Hardsuits -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitCombatRiot - noSpawn: true - name: riot combat hardsuit helmet - description: A heavy armoured helmet with a sealed visor with yellow slits and dual head-mounted lights. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.45 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.85 - Heat: 0.85 - -- type: entity - parent: ClothingHeadHelmetHardsuitCombatRiot - id: ClothingHeadHelmetHardsuitCombatWarden - name: warden's riot combat hardsuit helmet - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi - -# Advanced Combat Hardsuits -- type: entity - parent: ClothingHeadHardsuitWithLightBase - id: ClothingHeadHelmetHardsuitCombatAdvanced - noSpawn: true - name: advanced combat hardsuit helmet - description: A light but durable helmet with full-face protection and four head-mounted lights. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi - - type: PointLight - color: "#ffeead" - - type: PressureProtection - highPressureMultiplier: 0.40 - lowPressureMultiplier: 1000 - - type: Armor - modifiers: - coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.85 - Heat: 0.85 - - type: FlashImmunity # Counterpoint: the HoS can't see - - type: EyeProtection # They're blind as hell - -- type: entity - parent: ClothingHeadHelmetHardsuitCombatAdvanced - id: ClothingHeadHelmetHardsuitCombatHoS - name: head of security's advanced combat hardsuit helmet - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml deleted file mode 100644 index 1c5cef39af1..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/hats.yml +++ /dev/null @@ -1,194 +0,0 @@ -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatFedoraBlack - name: black fedora - description: A black fedora. Lookin' classy. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/blackfedora.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/blackfedora.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatFedoraChoc - name: brown fedora - description: A brown fedora. Lookin' snazzy. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/brownfedora.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/brownfedora.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatFedoraWhite - name: white fedora - description: A white fedora. Lookin' ritzy. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/whitefedora.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/whitefedora.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatFlatBlack - name: black flat cap - description: A black flat cap, for driving cabs and delivering the papers. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/flatblack.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/flatblack.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatFlatBrown - name: brown flat cap - description: A brown flat cap, for driving cabs and delivering the papers. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/flatbrown.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/flatbrown.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatFlatSyndie - name: black flat cap - suffix: Weapon - description: A black flat cap, for sending a message. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/flatblack.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/flatblack.rsi - - type: MeleeWeapon - attackRate: 1.5 - damage: - types: - Slash: 8 - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatSurgcapBlack - name: surgical cap - description: A black cap surgeons wear during operations. Keeps their hair from tickling your internal organs. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/surgcap_black.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/surgcap_black.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatSurgcapCyan - name: surgical cap - description: A cyan cap surgeons wear during operations. Keeps their hair from tickling your internal organs. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatSurgcapCybersun - name: surgical cap - description: A surgical cap worn by members of Cybersun's Biotechnology division. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatSurgcapPink - name: surgical cap - description: A pink cap surgeons wear during operations. Keeps their hair from tickling your internal organs. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/surgcap_pink.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/surgcap_pink.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatSurgcapRainbow - name: surgical cap - description: A rainbow cap surgeons wear during operations. Keeps their hair from tickling your internal organs. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatSurgcapWhite - name: surgical cap - description: A black cap surgeons wear during operations. Keeps their hair from tickling your internal organs. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/surgcap_white.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/surgcap_white.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadCourier - name: courier's cap - description: Special delivery. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Soft/couriersoft.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Soft/couriersoft.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadCourierFlipped - name: courier's cap flipped - description: Special delivery. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Soft/couriersoft.rsi - state: flipped-icon - - type: Clothing - sprite: DeltaV/Clothing/Head/Soft/couriersoft.rsi - equippedPrefix: flipped - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatDirCap - name: director's cap - description: A green cap with a director's rank emblem, belonging to a high-ranking member of Central Command. Whoever it is, they mean business. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/dircap.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/dircap.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatBeretLogi - name: logistics beret - description: For the intellectual and studious accountant. Definitely not a revolutionary symbol. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/beret_lo.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/beret_lo.rsi - -- type: entity - parent: ClothingHeadBase - id: ClothingHeadHatBeretCorpsman - name: corpsman beret - description: For style-conscious combat lifesavers and medical specialists alike. - components: - - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi - - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/beret_corpsman.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml deleted file mode 100644 index 5ff195cfda8..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/cloaks.yml +++ /dev/null @@ -1,33 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakMystagogue - name: mystagogue's cloak - suffix: Delta-V - description: A comfy white and purple cloak, perfect for those sleepless nights when you're haunted by the yet unsolved mysteries of the universe. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckCloakBoat - name: NanoTrasen boat cloak - description: A regal blue durathread boat cloak with a red felt lining and gold trim. Somehow, it's even more expensive than it looks. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckSalvager - name: salvager's cloak - description: Worn by dangerous people who've deconstructed stations with ease. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Cloaks/salvage.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/mantles.yml deleted file mode 100644 index 44453c0b674..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/mantles.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ClothingNeckMantleRyuzo - name: ornate mantle - description: In days of old, giving one's life was considered the ultimate sacrifice. The owner of this mantle, however, has dedicated their life twice over. - suffix: ADMIN ONLY, DO NOT MAP - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/mantles/ryuzo.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/mantles/ryuzo.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml deleted file mode 100644 index b516135040b..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/medals.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingNeckMedalBase - id: ClothingNeckBlackStar - name: black star medal - description: Given to crewmates that make the greatest of sacrifices in the performance of their duties. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Medals/blackstar.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Medals/blackstar.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml deleted file mode 100644 index 2b421e96752..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Neck/ties.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - parent: ClothingNeckBase - id: ClothingNeckTieWhite - name: white tie - description: An ivory-white tie. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Ties/whitetie.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Ties/whitetie.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckTieBlack - name: black tie - description: A charcoal-black tie. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Ties/blacktie.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Ties/blacktie.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckTieBrown - name: brown tie - description: A chocolate-brown tie. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Ties/browntie.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Ties/browntie.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckTieBlue - name: blue tie - description: A cerulean-blue tie. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Ties/bluetie.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Ties/bluetie.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckTieGreen - name: green tie - description: A grass-green tie. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Ties/greentie.rsi - -- type: entity - parent: ClothingNeckBase - id: ClothingNeckTieChem - name: chemistry tie - description: An safety-orange tie. - components: - - type: Sprite - sprite: DeltaV/Clothing/Neck/Ties/chemtie.rsi - - type: Clothing - sprite: DeltaV/Clothing/Neck/Ties/chemtie.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml deleted file mode 100644 index 80a06dfb39f..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/armor.yml +++ /dev/null @@ -1,68 +0,0 @@ -#Basic armor vest replacement -- type: entity - parent: ClothingOuterBaseMedium - id: ClothingOuterArmorPlateCarrier - name: plate carrier - description: A large and bulky carrier featuring steel plates that offer decent protection against gunfire. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi - - type: Armor # Good against gunshots, decent against everything else. Balanced by reduced movement speed. - modifiers: - coefficients: - Blunt: 0.80 - Slash: 0.80 - Piercing: 0.50 - Heat: 0.80 - - type: ClothingSpeedModifier - walkModifier: 0.90 - sprintModifier: 0.90 - - type: ExplosionResistance # More protective against explosives than you think. Helps in preventing all those vital organs from jiggling around o.o - damageCoefficient: 0.70 - -#Alternate / slim basic armor vest replacement -- type: entity - parent: ClothingOuterBaseMedium - id: ClothingOuterArmorDuraVest - name: durathread vest - description: A tight-fitting and sturdy armor vest, reinforced with durathread weave to protect against sharp objects and blunt force trauma. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Armor/duravest.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Armor/duravest.rsi - - type: Armor # Good against stabs and knocks, offers minimal protection from gunshots and lasfire. - modifiers: - coefficients: - Blunt: 0.60 - Slash: 0.60 - Piercing: 0.90 - Heat: 0.90 - - type: ExplosionResistance # Better than nothing against a blast or shockwave. - damageCoefficient: 0.90 - -- type: entity - parent: ClothingOuterBaseLarge - id: ClothingOuterArmorARC - name: ARCS - description: The Advanced Riot Control Suit, or ARCS for short, is generally regarded as far too bulky and overly hot for any practical use - but when the riots are raging, most officers invariably take great comfort from the thick and claustrophobic padding. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.40 - Slash: 0.40 - Piercing: 0.70 - Heat: 0.70 - - type: ClothingSpeedModifier - walkModifier: 0.75 - sprintModifier: 0.75 - - type: ExplosionResistance # Almost as good as a plate carrier! Still not going to save you from most bombs though. - damageCoefficient: 0.80 - - type: GroupExamine diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml deleted file mode 100644 index e0a38b169f0..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/coats.yml +++ /dev/null @@ -1,125 +0,0 @@ -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatRyuzo - name: Delphic coat - description: In another universe, The Syndicate are known as the good guys. - suffix: ADMIN ONLY, DO NOT MAP - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatHoPArmored - name: head of personnel's armored coat - description: A comfortable jacket that offers some protection against acts of god and man. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/hop.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/hop.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.8 - Slash: 0.8 - Piercing: 0.8 - Heat: 0.8 - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatOvercoat - name: overcoat - description: A warm, dark overcoat, suitable for formal occasions. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi - - type: TemperatureProtection - coefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Slash: 0.9 - Heat: 0.75 - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatGreatcoat - name: greatcoat - description: A drab and rugged greatcoat, padded for protection against the elements. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi - - type: TemperatureProtection - coefficient: 0.1 - - type: Armor # MAKE SURE THE STATS ALIGN WITH SEC WINTER COAT!!! - modifiers: - coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.85 - Heat: 0.75 - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatLeatherJacket - name: leather jacket - description: A rugged leather jacket, for fashion or for utility. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi - - type: TemperatureProtection - coefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Slash: 0.9 - Heat: 0.75 - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatCybersunWindbreaker - name: cybersun windbreaker - description: A paramedics windbreaker, sporting the official heraldry of Cybersuns meditech division. Its made of sturdy ballistic fiber. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi - - type: TemperatureProtection - coefficient: 0.1 - - type: Armor - modifiers: - coefficients: - Blunt: 0.95 - Slash: 0.95 - Piercing: 0.95 - Heat: 0.75 - -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterCoatHoPFormal - name: head of personnel's formal jacket - description: A showy and over-the-top jacket with gold buttons and red trim. More tacky than classy. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi - - type: TemperatureProtection - coefficient: 0.1 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml deleted file mode 100644 index d3451108774..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/hardsuits.yml +++ /dev/null @@ -1,175 +0,0 @@ -# Standard Combat Hardsuits -- type: entity - parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitCombatStandard - name: combat hardsuit - description: A purpose-built combat suit designed to protect its user against all manner of enemy combatants in low pressure environments. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi - - type: PressureProtection - highPressureMultiplier: 0.50 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.50 - - type: Armor # Good armour resistance across the board, comparable to the standard security hardsuit. - modifiers: - coefficients: - Blunt: 0.60 - Slash: 0.60 - Piercing: 0.60 - Radiation: 0.75 - Caustic: 0.75 - Heat: 0.75 - - type: ClothingSpeedModifier - walkModifier: 0.75 - sprintModifier: 0.75 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitCombatStandard - -- type: entity - parent: ClothingOuterHardsuitCombatStandard - id: ClothingOuterHardsuitCombatOfficer - name: security combat hardsuit - description: A purpose-built combat suit designed to protect its user against all manner of enemy combatants in low pressure environments. This one has station security markings. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitCombatOfficer - -# Medical Combat Hardsuits -- type: entity - parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitCombatMedical - name: medical combat hardsuit - description: A purpose-built combat suit designed to allow its user greater mobility for superior support of friendly units in active combat zones. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi - - type: PressureProtection # Less protective from high pressure than a standard hardsuit due to less plating. - highPressureMultiplier: 0.60 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.60 - - type: Armor # Slightly less armour than the standard hardsuit, but far higher mobility. - modifiers: - coefficients: - Blunt: 0.65 - Slash: 0.65 - Piercing: 0.65 - Radiation: 0.80 - Caustic: 0.80 - Heat: 0.80 - - type: ClothingSpeedModifier - walkModifier: 0.85 - sprintModifier: 0.85 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitCombatMedical - -- type: entity - parent: ClothingOuterHardsuitCombatMedical - id: ClothingOuterHardsuitCombatCorpsman - name: corpsman combat hardsuit - description: A purpose-built combat suit designed to allow its user greater mobility for superior support of friendly units in active combat zones. This one has station security markings. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitCombatCorpsman - -# Riot Combat Hardsuits -- type: entity - parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitCombatRiot - name: riot combat hardsuit - description: A purpose-built combat suit designed for crowd control against armed combatants in low pressure environments. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi - - type: PressureProtection - highPressureMultiplier: 0.45 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.40 - - type: Armor # More protective than a standard security hardsuit, but far slower. - modifiers: - coefficients: - Blunt: 0.50 - Slash: 0.50 - Piercing: 0.50 - Radiation: 0.70 - Caustic: 0.70 - Heat: 0.70 - - type: ClothingSpeedModifier - walkModifier: 0.65 - sprintModifier: 0.65 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitCombatRiot - -- type: entity - parent: ClothingOuterHardsuitCombatRiot - id: ClothingOuterHardsuitCombatWarden - name: warden's riot combat hardsuit - description: A purpose-built combat suit designed for crowd control against armed combatants in low pressure environments. This one has station security and warden's rank markings. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitCombatWarden - -# Advanced Combat Hardsuits -- type: entity - parent: ClothingOuterHardsuitBase - id: ClothingOuterHardsuitCombatAdvanced - name: advanced combat hardsuit - description: A purpose-built combat suit of second-generation design, providing unparalleled protection against all manner of kinetic forces in low pressure environments. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi - - type: PressureProtection - highPressureMultiplier: 0.40 - lowPressureMultiplier: 1000 - - type: ExplosionResistance - damageCoefficient: 0.40 - - type: Armor # About as protective as a riot hardsuit but with far less movement penalty. - modifiers: - coefficients: - Blunt: 0.50 - Slash: 0.50 - Piercing: 0.50 - Radiation: 0.75 - Caustic: 0.75 - Heat: 0.75 - - type: ClothingSpeedModifier - walkModifier: 0.80 - sprintModifier: 0.80 - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitCombatAdvanced - -- type: entity - parent: ClothingOuterHardsuitCombatAdvanced - id: ClothingOuterHardsuitCombatHoS - name: head of security's advanced combat hardsuit - description: A purpose-built combat suit of second-generation design, providing unparalleled protection against all manner of kinetic forces in low pressure environments. This one has station security and commander's rank markings. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi - - type: ToggleableClothing - clothingPrototype: ClothingHeadHelmetHardsuitCombatHoS diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml deleted file mode 100644 index fd7f70bd710..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/misc.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: ClothingOuterStorageBase - id: ClothingOuterApronChemist - name: chemical resistant apron - suffix: Chemistry - description: Made out of thick rubber, the color of this apron still leaves you perplexed. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi - - type: Armor - modifiers: - coefficients: - Caustic: 0.25 - - type: TemperatureProtection - coefficient: 1 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml deleted file mode 100644 index cdc79584076..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/vests.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: entity - parent: ClothingOuterBase - id: ClothingOuterVestFlak - name: flak jacket - description: A dusty and weathered flak jacket. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Vests/flak.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Vests/flak.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.75 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 - -- type: entity - parent: ClothingOuterBase - id: ClothingOuterVestFlakPress - name: flak jacket (press) - description: A flak jacket for reporters in wartorn zones. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.9 - Slash: 0.9 - Piercing: 0.75 - Heat: 0.9 - - type: ExplosionResistance - damageCoefficient: 0.9 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml deleted file mode 100644 index 2b881be52d6..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/OuterClothing/wintercoats.yml +++ /dev/null @@ -1,57 +0,0 @@ -- type: entity - parent: ClothingOuterWinterCoat - id: ClothingOuterWinterCCWarden - name: central command's armored winter coat - description: A tough, utilitarian coat designed for the wardens of Central Command. Reinforced kevlar plating and high quality fur allow the user to look stylish while staying protected. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi - - type: Armor - modifiers: - coefficients: - Blunt: 0.7 - Slash: 0.7 - Piercing: 0.4 #Stronger than the warden's armored jacket, because shenanigans and CC spends alot of money. - Heat: 0.75 - -- type: entity - parent: ClothingOuterWinterCoat - id: ClothingOuterCorporateJacket - name: Nanotrasen Corporate Jacket - description: A cozy jacket with the Nanotrasen logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi - -- type: entity - parent: ClothingOuterWinterCoat - id: ClothingOuterDenimJacket - name: Denim jacket - description: A jean jacket with a warm inner lining. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi - -- type: entity - parent: ClothingOuterWinterCoat - id: ClothingOuterStasecSweater - name: station security sweater - description: A thick synthetic sweater with reinforced shoulders and elbows, enough to warm even the harshest security officer's cold heart. - components: - - type: Sprite - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi - - type: Clothing - sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi - - type: Armor # Keep this the same as the sec winter coat - modifiers: - coefficients: - Blunt: 0.85 - Slash: 0.85 - Piercing: 0.85 - Heat: 0.75 diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/boots.yml deleted file mode 100644 index 0260909edc3..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/boots.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: entity - parent: ClothingShoesBaseButcherable - id: ClothingShoesBootsRyuzo - name: rugged fur boots - description: These would be perfect for chilly winter walks out in the forests - if they still existed, that is. - suffix: ADMIN ONLY, DO NOT MAP - components: - - type: Sprite - sprite: DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi - - type: Clothing - sprite: DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi - -- type: entity - parent: ClothingShoesBaseButcherable - id: ClothingShoesBootsFishing - name: fishing boots - description: Smells fishy! - components: - - type: Sprite - sprite: DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi - - type: Clothing - sprite: DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml deleted file mode 100644 index acee4da64f9..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/misc.yml +++ /dev/null @@ -1,10 +0,0 @@ -- type: entity - parent: ClothingShoesBaseButcherable - id: ClothingShoesMiscWhite - name: white leather shoes - description: Impeccably shined white leather shoes. Don't tread on these tootsies. - components: - - type: Sprite - sprite: DeltaV/Clothing/Shoes/Misc/whiteleather.rsi - - type: Clothing - sprite: DeltaV/Clothing/Shoes/Misc/whiteleather.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml deleted file mode 100644 index 86c7d4ef53c..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/specific.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - parent: ClothingShoesBase - id: ClothingShoesEnclosedChem - name: enclosed shoes - description: Those shoes will protect you from melting your feet while working. - components: - - type: Sprite - sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi - - type: Clothing - sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi - - type: Armor - modifiers: - coefficients: - Caustic: 0.95 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml deleted file mode 100644 index 4c027637645..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpskirts.yml +++ /dev/null @@ -1,95 +0,0 @@ -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtHoPMess - name: head of personnel's mess kit - description: A swanky uniform with tasteful gold and red trim. Keep your latte away from this. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi - -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformSkirtCourier - name: courier's jumpskirt - description: Enemy of dogs everywhere. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi - -# Security alt uniforms - -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtSecBlue - name: blue security jumpskirt - description: A cool blue shirt over charcoal skirt, for the calm and collected security officer. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi - -# Warden alt uniforms - -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtWardenBlue - name: blue warden's jumpskirt - description: A cool blue shirt with ice-white markings and warden's epaulettes. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi - -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtWardenGrey - name: grey warden's jumpskirt - description: Charcoal skirt, a grey shirt, and white warden's markings and epaulettes. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi - -# HoS alt uniforms - -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtHoSBlue - name: head of security's blue jumpskirt - description: A blue Station Security shirt with charcoal skirt. Features gold emblems and commander's epaulettes. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi - -- type: entity - parent: ClothingUniformSkirtBase - id: ClothingUniformJumpskirtHoSGrey - name: head of security's grey jumpskirt - description: A grey Station Security shirt with charcoal skirt. Stands out with red highlights, gold emblems, and commander's epaulettes. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi - -# Central Command Uniform - ported from Velta - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpskirtCentcomDirector - name: director's jumpskirt - description: A sharp and professional jumpskirt worn by a high-ranking member of Central Command. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml deleted file mode 100644 index f3fdeabd107..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/jumpsuits.yml +++ /dev/null @@ -1,256 +0,0 @@ -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitHoPMess - name: head of personnel's mess kit - description: A swanky uniform with tasteful gold and red trim. Keep your latte away from this. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitBoatswain - name: boatswain's turtleneck - description: A comfortable rollneck and slacks. Suitable attire for a pipe-smoking bosun. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitBlack - name: black suit - description: A crisp white shirt and charcoal slacks. Reminds you of the old times. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitBlackAlt - name: dark suit - description: A crisp grey shirt and charcoal slacks. Reminds you of overcast days. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitBlackMob - name: mobster's attire - description: A crisp red shirt and charcoal slacks. Reminds you of your debts. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitBrown - name: brown suit - description: A crisp white shirt and chocolate slacks. Reminds you of dusty offices. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitBrownAlt - name: suspicious suit - description: A crisp grey shirt and chocolate slacks. Reminds you of clandestine operators. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitBrownMob - name: gangster's attire - description: A crisp red shirt and chocolate slacks. Reminds you of drivebys. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitWhite - name: white suit - description: A crisp white shirt and ivory slacks. Reminds you of swans. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitWhiteAlt - name: negative suit - description: A crisp grey shirt and ivory slacks. Reminds you of daguerreotypes. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSuitWhiteMob - name: mafioso's attire - description: A crisp red shirt and ivory slacks. Reminds you of family. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSecFormal - name: security formal suit - description: A ceremonial piece of Station Security kit, for special occasions of any kind. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitSober - name: sober sweater - description: For the more lucid moments. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitLostTourist - name: lost tourist uniform - description: The uniform of those who just want to relax on a beach... Where is the beach anyway? - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitJeansRed - name: red sweater with jeans - description: A red sweater with blue jeans. This one has the dominant jeans. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_red.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_red.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitJeansGreen - name: green sweater with jeans - description: A green sweater with blue jeans. This one has the recessive jeans. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_green.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_green.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitJeansBrown - name: brown sweater with jeans - description: A brown sweater with blue jeans. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformCourier - name: courier's uniform - description: - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi - -# Warden alt uniforms - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitWardenBlue - name: blue warden's jumpsuit - description: A cool blue shirt with ice-white markings and warden's epaulettes. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitWardenGrey - name: grey warden's jumpsuit - description: Charcoal pants, a grey shirt, and white warden's markings and epaulettes. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi - -# Central Command Uniform - ported from Velta - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitCentcomDirector - name: director's jumpsuit - description: A sharp and professional jumpsuit worn by a high-ranking member of Central Command. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitKilt - name: kilt - description: A fine bit o' garb for the lad an' lasses. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi - -- type: entity - parent: ClothingUniformBase - id: ClothingUniformJumpsuitChemShirt - name: formal chemistry suit - description: There's still some odd stains on this suit. Hm. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/scrubs.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/scrubs.yml deleted file mode 100644 index c4de1844399..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Clothing/Uniforms/scrubs.yml +++ /dev/null @@ -1,65 +0,0 @@ -- type: entity - parent: ClothingUniformBase - id: UniformScrubsColorBlack - name: black scrubs - description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Scrubs/black.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Scrubs/black.rsi - -- type: entity - parent: ClothingUniformBase - id: UniformScrubsColorCyan - name: cyan scrubs - description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi - -- type: entity - parent: ClothingUniformBase - id: UniformScrubsColorPink - name: pink scrubs - description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Scrubs/pink.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Scrubs/pink.rsi - -- type: entity - parent: ClothingUniformBase - id: UniformScrubsColorRainbow - name: rainbow scrubs - description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi - -- type: entity - parent: ClothingUniformBase - id: UniformScrubsColorWhite - name: white scrubs - description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Scrubs/white.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Scrubs/white.rsi - -- type: entity - parent: ClothingUniformBase - id: UniformScrubsColorCybersun - name: cybersun scrubs - description: The official uniform of Cybersun's biotechnology division - components: - - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi - - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml deleted file mode 100644 index 1e014aab734..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/ghost_roles.yml +++ /dev/null @@ -1,68 +0,0 @@ -#Delta-V - This file is licensed under AGPLv3 -# Copyright (c) 2024 Delta-V Contributors -# See AGPLv3.txt for details. - -- type: entity - id: SpawnPointPlayerCharacter - name: ghost role spawn point - suffix: player character, DO NOT MAP - parent: MarkerBase - components: - - type: GhostRole - name: Roleplay Ghost Role - description: Placeholder - rules: Placeholder - - type: GhostRoleCharacterSpawner - - type: Sprite - sprite: Markers/jobs.rsi - layers: - - state: green - - sprite: Mobs/Species/Human/parts.rsi - state: full - -- type: entity # Part of PirateRadioSpawn - noSpawn: true - id: SpawnPointGhostSyndicateListener - name: ghost role spawn point - suffix: syndicate listener - parent: MarkerBase - components: - - type: GhostRole - name: ghost-role-information-listeningop-name - description: ghost-role-information-listeningop-description - rules: ghost-role-information-listeningop-rules - requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this. - - !type:OverallPlaytimeRequirement - time: 259200 # 72 hours - - !type:DepartmentTimeRequirement - department: Security - time: 40000 # 11.1 hours - - !type:DepartmentTimeRequirement - department: Civilian - time: 40000 # 11.1 hours - - !type:DepartmentTimeRequirement - department: Command - time: 40000 # 11.1 hours - - type: GhostRoleMobSpawner - prototype: MobHumanSyndicateListener - - type: Sprite - sprite: Markers/jobs.rsi - layers: - - state: green - - sprite: Structures/Wallmounts/signs.rsi - state: radiation - -- type: entity - parent: MarkerBase - id: SpawnPointGhostParadoxAnomaly - name: paradox anomaly spawn point - components: - - type: GhostRole - name: ghost-role-information-paradox-anomaly-name - description: ghost-role-information-paradox-anomaly-description - rules: ghost-role-information-paradox-anomaly-rules - - type: ParadoxAnomalySpawner - - type: Sprite - sprite: Markers/jobs.rsi - layers: - - state: green diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml deleted file mode 100644 index e662ecca743..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ /dev/null @@ -1,15 +0,0 @@ - -- type: entity - id: SpawnPointMedicalBorg - parent: SpawnPointJobBase - name: medical cyborg - components: - - type: SpawnPoint - job_id: MedicalBorg - - type: Sprite - layers: - - state: green - - sprite: Mobs/Silicon/chassis.rsi - state: medical - - sprite: Mobs/Silicon/chassis.rsi - state: medical_e diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/mobs.yml deleted file mode 100644 index 1b6654fd3b7..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/mobs.yml +++ /dev/null @@ -1,38 +0,0 @@ -- type: entity - name: Arctic Fox Siobhan Spawner - id: SpawnMobArcticFoxSiobhan - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: ai - - type: ConditionalSpawner - prototypes: - - MobArcticFoxSiobhan - -- type: entity - name: Sec Dog Laika Spawner - id: SpawnMobSecDogLaika - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: ai - - type: ConditionalSpawner - prototypes: - - MobSecDogLaika - -- type: entity - name: Syndicate Guard Spawner - id: SpawnMobRadioGuard - parent: MarkerBase - components: - - type: Sprite - layers: - - state: green - - state: ai - - type: ConditionalSpawner - prototypes: - - MobRadioGuard diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml deleted file mode 100644 index 92615131f05..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/animals.yml +++ /dev/null @@ -1,178 +0,0 @@ -- type: entity - name: arctic fox - parent: SimpleMobBase - id: MobArcticFox - description: Wears a regal coat of snowy elegance, belying its cold and resourceful nature. - components: - - type: Sprite - drawdepth: Mobs - sprite: DeltaV/Mobs/Pets/arcticfox.rsi - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: arcticfox - - type: Physics - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 50 #They actually are pretty light, I looked it up - mask: - - MobMask - layer: - - MobLayer - - type: Appearance - - type: Inventory - speciesId: arcticfox - templateId: pet - - type: InventorySlots - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: DamageStateVisuals - states: - Alive: - Base: arcticfox - Critical: - Base: arcticfox_crit - Dead: - Base: arcticfox_dead - - type: Butcherable - spawned: - - id: FoodMeat - amount: 3 - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-soft-floofy - interactFailureString: petting-failure-generic - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/Animals/fox_squeak.ogg - - type: Temperature - coldDamageThreshold: 210 - coldDamage: - types: - Cold: 0.1 - - type: Grammar - attributes: - gender: epicene - - type: Bloodstream - bloodMaxVolume: 100 - - type: MobPrice - price: 400 - - type: Tag - tags: - - VimPilot - -- type: entity - name: security dog - parent: SimpleMobBase - id: MobSecDog - description: Funnily enough, this pig is actually a dog. - components: - - type: GhostRole - makeSentient: true - allowSpeech: true - allowMovement: true - name: "sentient security dog" - description: "Help out the security team by biting the baddies and barking at everything that moves." - - type: GhostTakeoverAvailable - - type: CombatMode - - type: MovementSpeedModifier - baseWalkSpeed : 3.5 - baseSprintSpeed : 5.0 - - type: NpcFactionMember - factions: - - PetsNT - - type: Sprite - drawdepth: Mobs - sprite: DeltaV/Mobs/Pets/secdog.rsi - layers: - - map: ["enum.DamageStateVisualLayers.Base"] - state: secdog - - type: HTN - rootTask: - task: SimpleHostileCompound - - type: Physics - - type: Speech - speechVerb: Canine - speechSounds: Vulpkanin - - type: Fixtures - fixtures: - fix1: - shape: - !type:PhysShapeCircle - radius: 0.35 - density: 120 # BIG DOG :3 - mask: - - MobMask - layer: - - MobLayer - - type: MobThresholds - thresholds: # BIG DOG. STRONG DOG - 0: Alive - 100: Critical - 200: Dead - - type: StaminaDamageOnHit - damage: 22 - - type: MeleeWeapon - hidden: true - altDisarm: false - soundHit: - path: /Audio/Effects/bite.ogg - angle: 0 - attackRate: 1 - damage: - types: - Slash: 10 - - type: SlowOnDamage - speedModifierThresholds: - 40: 0.70 - 80: 0.30 - - type: Appearance - - type: Inventory - speciesId: secdog - templateId: secdog - - type: InventorySlots - - type: Strippable - - type: UserInterface - interfaces: - - key: enum.StrippingUiKey.Key - type: StrippableBoundUserInterface - - type: DamageStateVisuals - states: - Alive: - Base: secdog - Critical: - Base: secdog_crit - Dead: - Base: secdog_dead - - type: Butcherable - spawned: - - id: FoodMeat - amount: 2 - - type: ReplacementAccent - accent: dog - - type: InteractionPopup - successChance: 0.5 - interactSuccessString: petting-success-dog - interactFailureString: petting-failure-generic - interactSuccessSpawn: EffectHearts - interactSuccessSound: - path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark2.ogg - - type: Grammar - attributes: - gender: epicene - - type: Bloodstream - bloodMaxVolume: 300 # BIG DOG. MUCH BLOOD :3 - - type: Puller - needsHands: false - - type: MobPrice - price: 400 - - type: Tag - tags: - - DoorBumpOpener - - VimPilot diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml deleted file mode 100644 index 2d1a1d72c48..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/pets.yml +++ /dev/null @@ -1,55 +0,0 @@ -- type: entity - name: Siobhan - parent: MobArcticFox - id: MobArcticFoxSiobhan - description: Her name is pronounced "Shivahn", but she is known as Shivs by her associates. A fluffy, adorable arctic fox. - components: - - type: InteractionPopup - successChance: 1 - - type: Butcherable - spawned: - - id: FoodMeat - amount: 3 - - type: Grammar - attributes: - proper: true - gender: female - - type: Tag - tags: - - CannotSuicide - - VimPilot - -- type: entity - name: Laika - parent: MobSecDog - id: MobSecDogLaika - description: Much like her namesake, Laika is a specimen of indeterminate breed, fresh off the streets and ready to tussle. - components: - - type: GhostRole - makeSentient: true - allowSpeech: true - allowMovement: true - name: "Laika" - description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders." - requirements: - - !type:DepartmentTimeRequirement - department: Security - time: 14400 # DeltaV - 4 hours - - type: GhostTakeoverAvailable - - type: InteractionPopup - successChance: 1 - - type: Butcherable - spawned: - - id: FoodMeat - amount: 2 - - type: Grammar - attributes: - proper: true - gender: female - - type: Loadout - prototypes: [ MobSecDogLaikaGear ] - - type: Tag - tags: - - CannotSuicide - - VimPilot - - DoorBumpOpener diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/human.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/human.yml deleted file mode 100644 index d539c58496a..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/human.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity # Delta-V : Part of a mid-round PirateRadioSpawn - noSpawn: true - parent: MobHumanSyndicateAgent - id: MobHumanSyndicateListener - name: Syndicate Listener - components: - - type: Loadout - prototypes: [SyndicateListenerGear] - - type: NpcFactionMember - factions: - - Syndicate - - type: AutoTraitor - giveUplink: false - giveObjectives: false - - type: AutoImplant - implants: - - DeathAcidifierImplant diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml deleted file mode 100644 index 2c8b01553a7..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/humanoid.yml +++ /dev/null @@ -1,78 +0,0 @@ -- type: entity # Delta-V part of PirateRadioSpawn - id: RandomHumanoidSpawnerListener - name: Syndicate Listener - components: - - type: Sprite - sprite: Mobs/Species/Human/parts.rsi - state: full - - type: RandomHumanoidSpawner - settings: SyndicateListener - -- type: randomHumanoidSettings - id: SyndicateListener - components: - - type: Loadout - prototypes: [SyndicateListenerGear] - -# Mobsters - -- type: entity - id: RandomHumanoidSpawnerMobster - name: mobster - components: - - type: Sprite - netsync: false - sprite: DeltaV/Markers/jobs.rsi - state: mobster - - type: RandomMetadata - nameSegments: - - fake_human_first - - names_last - - type: RandomHumanoidSpawner - settings: Mobster - -- type: randomHumanoidSettings - id: Mobster - randomizeName: false - components: - - type: GhostRole - name: Mobster - description: Break kneecaps, spray lead, keep your mouth shut. - - type: GhostTakeoverAvailable - - type: Loadout - prototypes: [ MobsterGear ] - - type: RandomMetadata - nameSegments: - - fake_human_first - - names_last - -- type: entity - id: RandomHumanoidSpawnerMobsterAlt - name: mobster - suffix: alt - components: - - type: Sprite - netsync: false - sprite: DeltaV/Markers/jobs.rsi - state: mobster - - type: RandomMetadata - nameSegments: - - fake_human_first - - names_last - - type: RandomHumanoidSpawner - settings: MobsterAlt - -- type: randomHumanoidSettings - id: MobsterAlt - randomizeName: false - components: - - type: GhostRole - name: Mobster - description: Break kneecaps, spray lead, keep your mouth shut. - - type: GhostTakeoverAvailable - - type: Loadout - prototypes: [ MobsterGearAlt ] - - type: RandomMetadata - nameSegments: - - fake_human_first - - names_last diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml deleted file mode 100644 index d48cb332fe1..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/silicon.yml +++ /dev/null @@ -1,20 +0,0 @@ - -- type: entity - id: PlayerBorgMedical - parent: BorgChassisMedical - suffix: Diagnosis, Treatment - components: - - type: ContainerFill - containers: - borg_brain: - - PositronicBrain - borg_module: - - BorgModuleDiagnosis - - BorgModuleTreatment - - type: ItemSlots - slots: - cell_slot: - name: power-cell-slot-component-slot-name-default - startingItem: PowerCellMedium - - type: RandomMetadata - nameSegments: [names_borg] diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml deleted file mode 100644 index 8f05f0f55fe..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml +++ /dev/null @@ -1,127 +0,0 @@ -- type: entity - parent: DrinkGlassBase - id: DrinkHealthViolationGlass - name: health code violation - description: Allegedly it's a cocktail. The warning cone motif seems apt. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: HealthViolation - Quantity: 30 - - type: Sprite - sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkGunmetalGlass - name: gunmetal glass - description: A cloudy mix of rum, cream, and... is that welding fuel? Probably tasty. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Gunmetal - Quantity: 30 - - type: Sprite - sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkLemonDropGlass - name: lemon drop - description: A martini glass filled with a translucent mix of refreshing lemony goodness. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: LemonDrop - Quantity: 30 - - type: Sprite - sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkGreenGrassGlass - name: green grass - description: An odd green cocktail, topped with oranges, ice, and a plastic straw. Curious. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: GreenGrass - Quantity: 30 - - type: Sprite - sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkDaiquiriGlass - name: classic daiquiri - description: Rum, lime, and simple syrup. Such class, such refinement. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Daiquiri - Quantity: 30 - - type: Sprite - sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkArsonistsBrewGlass - name: arsonist's brew - description: It's probably not concerning that it's glowing faintly. Or bubbling. Or smoking. No, not at all. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: ArsonistsBrew - Quantity: 30 - - type: Sprite - sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkKvassGlass - name: kvass glass - description: A cool refreshing drink with a taste of socialism. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Kvass - Quantity: 30 - - type: Sprite - sprite: Objects/Consumable/Drinks/kvass.rsi - -- type: entity - parent: DrinkGlassBase - id: DrinkMothamphetamineGlass - name: mothamphetamine - description: A strangely... Fuzzy drink. It has a chaotic aura. - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Mothamphetamine - Quantity: 30 - - type: Sprite - sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Baked/pie.yml deleted file mode 100644 index d86b5142dbf..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/Baked/pie.yml +++ /dev/null @@ -1,39 +0,0 @@ -- type: entity - name: pumpkin pie - parent: FoodPieBase - id: FoodPiePumpkin - description: A seasonal favorite, consisting mostly of pumpkin and a handful of spooky spices. - components: - - type: FlavorProfile - flavors: - - sweet - - pumpkin - - type: Sprite - layers: - - state: tin - - sprite: DeltaV/Objects/Consumable/Food/Baked/pie.rsi - state: pumpkin - - type: SliceableFood - slice: FoodPiePumpkinSlice - - type: Tag - tags: - - Fruit - - Pie - -- type: entity - name: slice of pumpkin pie - parent: FoodPieSliceBase - id: FoodPiePumpkinSlice - components: - - type: FlavorProfile - flavors: - - sweet - - pumpkin - - type: Sprite - sprite: DeltaV/Objects/Consumable/Food/Baked/pie.rsi - state: pumpkin-slice - - type: Tag - tags: - - Fruit - - Pie -# Tastes like pie, pumpkin. diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/meals.yml deleted file mode 100644 index 66ea74189f8..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/meals.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: entity - name: grilled cheese - parent: FoodMealBase - id: FoodMealGrilledCheese - description: Two slices of bread cooked in butter with a lofty wedge of cheese in the middle. - components: - - type: FlavorProfile - flavors: - - butter - - cheesy - - type: Sprite - sprite: DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi - state: grilledcheese - - type: SolutionContainerManager - solutions: - food: - maxVol: 15 - reagents: - - ReagentId: Nutriment - Quantity: 6 - - ReagentId: Vitamin - Quantity: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml deleted file mode 100644 index 01b5be7af0c..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Food/soup.yml +++ /dev/null @@ -1,25 +0,0 @@ -- type: entity - name: scrambled eggs - parent: FoodBowlBase - id: FoodMealScrambledEggs - description: Some cooked eggs with salt. Yummy! - components: - - type: FlavorProfile - flavors: - - egg - - salty - - type: Sprite - sprite: DeltaV/Objects/Consumable/Food/scrambledeggs.rsi - layers: - - state: bowl - - state: scrambled-eggs - - type: SolutionContainerManager - solutions: - food: - maxVol: 10 - reagents: - - ReagentId: Nutriment - Quantity: 5 - - ReagentId: Protein - Quantity: 5 -# Tastes like eggs, butter and salt diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml deleted file mode 100644 index df89ea44333..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: entity - parent: ReinforcementRadioSyndicate - id: ReinforcementRadioSyndicateNukieMouse - name: suspicious moldy cheese - description: Moldy cheese with a little worm sticking out of it and a... blinking antenna? Might attract an odd mouse. - components: - - type: Sprite - sprite: DeltaV/Objects/Devices/communication.rsi - layers: - - state: cheese-radio - - type: GhostRole - name: ghost-role-information-nukie-mouse-name - description: ghost-role-information-nukie-mouse-description - rules: ghost-role-information-nukie-mouse-rules - - type: GhostRoleMobSpawner - prototype: MobNukieMouse - - type: EmitSoundOnUse - sound: /Audio/Animals/mouse_squeak.ogg - - type: UseDelay - delay: 300 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml deleted file mode 100644 index c41c235c136..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/encryption_keys.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - parent: EncryptionKey - id: EncryptionKeyPrison - name: Prison encryption key - description: An encryption key used by anybody who needs to speak with the prisoners - components: - - type: EncryptionKey - channels: - - Prison - defaultChannel: Prison - - type: Sprite - sprite: DeltaV/Objects/Devices/encryption_keys.rsi - layers: - - state: crypt_orange - - state: prisoner_label diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml deleted file mode 100644 index 6ee3a7543f7..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ /dev/null @@ -1,54 +0,0 @@ -#Delta-V - This file is licensed under AGPLv3 -# Copyright (c) 2024 Delta-V Contributors -# See AGPLv3.txt for details. - -- type: entity - parent: BasePDA - id: CorpsmanPDA - name: corpsman PDA - description: Red and Sterile. Has a built-in health analyzer. - components: - - type: Sprite - sprite: DeltaV/Objects/Devices/pda.rsi - layers: - - map: [ "enum.PdaVisualLayers.Base" ] - - state: "light_overlay" - map: [ "enum.PdaVisualLayers.Flashlight" ] - shader: "unshaded" - visible: false - - state: "id_overlay" - map: [ "enum.PdaVisualLayers.IdLight" ] - shader: "unshaded" - visible: false - - type: CartridgeLoader # DeltaV - Crime Assist - preinstalled: - - CrewManifestCartridge - - NotekeeperCartridge - - NewsReaderCartridge - - CrimeAssistCartridge - - type: Pda - id: BrigmedicIDCard - state: pda-corpsman - - type: PdaBorderColor - borderColor: "#A32D26" - accentVColor: "#447987" - - type: Icon - sprite: DeltaV/Objects/Devices/pda.rsi - state: pda-corpsman - - type: HealthAnalyzer - scanDelay: 1 - scanningEndSound: - path: "/Audio/Items/Medical/healthscanner.ogg" - -- type: entity - parent: SyndiPDA - id: SyndiListeningPostPDA - components: - - type: Pda - id: SyndicateIDCard - state: pda-syndi-agent - penSlot: - startingItem: CyberPen - whitelist: - tags: - - Write diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml deleted file mode 100644 index 74993ae94a1..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/station_beacon.yml +++ /dev/null @@ -1,136 +0,0 @@ -#Command -- type: entity - parent: DefaultStationBeaconCommand - id: DefaultStationBeaconConferenceRoom - suffix: Conference Room - components: - - type: NavMapBeacon - text: station-beacon-conference-room - -#Medical -- type: entity - parent: DefaultStationBeaconMedical - id: DefaultStationBeaconVirology - suffix: Virology - components: - - type: NavMapBeacon - text: station-beacon-virology - -- type: entity - parent: DefaultStationBeaconMedical - id: DefaultStationBeaconMetempsychosis - suffix: Cloning #Metempsychosis - components: - - type: NavMapBeacon - text: station-beacon-metempsychosis - -- type: entity - parent: DefaultStationBeaconMedical - id: DefaultStationBeaconExam - suffix: Exam Room - components: - - type: NavMapBeacon - text: station-beacon-exam - -- type: entity - parent: DefaultStationBeaconMedical - id: DefaultStationBeaconMedicalOutpost - suffix: Medical Outpost - components: - - type: NavMapBeacon - text: station-beacon-med-outpost - -- type: entity - parent: DefaultStationBeaconMedical - id: DefaultStationBeaconPsychologist - suffix: Psychologist - components: - - type: NavMapBeacon - text: station-beacon-psych - -#Epistemics -- type: entity - parent: DefaultStationBeaconScience - id: DefaultStationBeaconProber - suffix: Glimmer Prober - components: - - type: NavMapBeacon - text: station-beacon-glimmer-prober - -- type: entity - parent: DefaultStationBeaconScience - id: DefaultStationBeaconMantis - suffix: Forensic Mantis - components: - - type: NavMapBeacon - text: station-beacon-forensic-mantis - -#Logistics -- type: entity - parent: DefaultStationBeaconSupply - id: DefaultStationBeaconMailroom - suffix: Mailroom - components: - - type: NavMapBeacon - text: station-beacon-mailroom - -#Engineering -- type: entity - parent: DefaultStationBeaconEngineering - id: DefaultStationBeaconEngiOutpost - suffix: Engi Outpost - components: - - type: NavMapBeacon - text: station-beacon-engi-outpost - -#Service -- type: entity - parent: DefaultStationBeaconService - id: DefaultStationBeaconJanitorsOffice - suffix: Janitor's Office - components: - - type: NavMapBeacon - text: station-beacon-janitor-office - -- type: entity - parent: DefaultStationBeaconService - id: DefaultStationBeaconReporter - suffix: Reporter - components: - - type: NavMapBeacon - text: station-beacon-reporter - -#Surveilance -- type: entity - parent: DefaultStationBeaconAI - id: DefaultStationBeaconCameraServerRoom - suffix: Camera Servers - components: - - type: NavMapBeacon - text: station-beacon-camera-servers - -#General -- type: entity - parent: DefaultStationBeacon - id: DefaultStationBeaconBoxing - suffix: Boxing Ring - components: - - type: NavMapBeacon - text: station-beacon-boxing-ring - -- type: entity - parent: DefaultStationBeacon - id: DefaultStationBeaconPark - suffix: Park - components: - - type: NavMapBeacon - text: station-beacon-park - -#Security -- type: entity - parent: DefaultStationBeaconSecurity - id: DefaultStationBeaconCorpsman - suffix: Corpsman - components: - - type: NavMapBeacon - text: station-beacon-corpsman diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml deleted file mode 100644 index 2a22e6fd938..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toys.yml +++ /dev/null @@ -1,47 +0,0 @@ -- type: entity - parent: BasePlushie - id: ToyRenault - name: renault toy - description: Almost as cute and adorable as the real Renault! - components: - - type: Sprite - sprite: DeltaV/Objects/Fun/Toys/renaulttoy.rsi - state: base - - type: EmitSoundOnUse - sound: - path: /Audio/Animals/fox_squeak.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Animals/fox_squeak.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/Animals/fox_squeak.ogg - -- type: entity - parent: BasePlushie - id: ToySiobhan - name: siobhan toy - description: Nearly as fluffy as the real Shivs! - components: - - type: Sprite - sprite: DeltaV/Objects/Fun/Toys/siobhantoy.rsi - state: base - - type: EmitSoundOnUse - sound: - path: /Audio/Animals/fox_squeak.ogg - - type: EmitSoundOnTrigger - sound: - path: /Audio/Animals/fox_squeak.ogg - - type: MeleeWeapon - soundHit: - path: /Audio/Animals/fox_squeak.ogg - -- type: entity - parent: BaseFigurine - id: ToyZero - name: toy zero - description: whirrrrrrrrr taktaktaktaktak BOOM whirrrrrrr - components: - - type: Sprite - sprite: DeltaV/Objects/Fun/Toys/zerotoy.rsi - state: icon diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml deleted file mode 100644 index 9849642f939..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/implanters.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: entity - id: BionicSyrinxImplanter - name: bionic syrinx implanter - parent: BaseImplantOnlyImplanterSyndi - components: - - type: Implanter - implant: BionicSyrinxImplant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml deleted file mode 100644 index 2494de534e4..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/rubber_stamp.yml +++ /dev/null @@ -1,27 +0,0 @@ -- type: entity - name: psychologist's rubber stamp - parent: RubberStampBase - id: RubberStampPsychologist - suffix: DO NOT MAP - components: - - type: Stamp - stampedName: stamp-component-stamped-name-psychologist - stampedColor: "#00ccff" - stampState: "paper_stamp-psychologist" - - type: Sprite - sprite: DeltaV/Objects/Misc/stamps.rsi - state: stamp-psychologist - -- type: entity - name: lawyer's rubber stamp - parent: RubberStampBase - id: RubberStampLawyer - suffix: DO NOT MAP - components: - - type: Stamp - stampedName: stamp-component-stamped-name-lawyer - stampedColor: "#696969" - stampState: "paper_stamp-lawyer" - - type: Sprite - sprite: DeltaV/Objects/Misc/stamps.rsi - state: stamp-lawyer diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml deleted file mode 100644 index 93a9641f7be..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/subdermal_implants.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: entity - parent: BaseSubdermalImplant - id: BionicSyrinxImplant - name: bionic syrinx implant - description: This implant lets a harpy adjust their voice to whoever they can think of. - noSpawn: true - components: - - type: SubdermalImplant - implantAction: ActionSyrinxChangeVoiceMask - whitelist: - components: - - HarpySinger - - type: VoiceMasker - - type: Tag - tags: - - SubdermalImplant - - BionicSyrinxImplant diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml deleted file mode 100644 index febf8d2765a..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ /dev/null @@ -1,25 +0,0 @@ -- type: entity - parent: BaseVendingMachineRestock - id: BaseVendingMachineRestockDeltaV - name: vending machine restock box - description: A box for restocking vending machines with corporate goodies. - abstract: true - components: - - type: Sprite - sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi - -- type: entity - parent: BaseVendingMachineRestockDeltaV - id: VendingMachineRestockPride - name: Pride-O-Mat restock box - description: The station needs more plushie sharks and you know it. - components: - - type: VendingMachineRestock - canRestock: - - PrideDrobeInventory - - type: Sprite - layers: - - state: base - - state: green_bit - shader: unshaded - - state: refill_pride diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Specific/chemistry-bottles.yml deleted file mode 100644 index 7c85194de65..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/chemistry-bottles.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: entity - id: NapalmChemistryBottle - name: napalm bottle - parent: BaseChemistryEmptyBottle - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Napalm - Quantity: 30 - - type: Tag - tags: - - Bottle - -- type: entity - id: UltravasculineChemistryBottle - name: ultravasculine bottle - parent: BaseChemistryEmptyBottle - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Ultravasculine - Quantity: 30 - - type: Tag - tags: - - Bottle diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml deleted file mode 100644 index 354f0db5233..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ /dev/null @@ -1,88 +0,0 @@ -- type: entity - id: BaseMagazinePistolSpecial - name: pistol magazine (.38 special) - parent: BaseItem - abstract: true - components: - - type: Tag - tags: - - MagazinePistolSpecial - - type: BallisticAmmoProvider - mayTransfer: true - whitelist: - tags: - - CartridgeSpecial - capacity: 5 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 6 - zeroVisible: false - - type: Appearance - -- type: entity - id: MagazinePistolSpecial - name: pistol magazine (.38 special) - parent: BaseMagazinePistolSpecial - components: - - type: BallisticAmmoProvider - proto: CartridgeSpecial - - type: Sprite - layers: - - state: red - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: MagazinePistolSpecialPractice - name: pistol magazine (.38 special practice) - parent: BaseMagazinePistolSpecial - components: - - type: BallisticAmmoProvider - proto: CartridgeSpecialPractice - - type: Sprite - layers: - - state: practice - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: MagazinePistolSpecialRubber - name: pistol magazine (.38 special rubber) - parent: BaseMagazinePistolSpecial - components: - - type: BallisticAmmoProvider - proto: CartridgeSpecialRubber - - type: Sprite - layers: - - state: rubber - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - -- type: entity - id: MagazinePistolSpecialMindbreaker - name: pistol magazine (.38 special mindbreaker) - parent: BaseMagazinePistolSpecial - components: - - type: BallisticAmmoProvider - proto: CartridgeSpecialMindbreaker - - type: Sprite - layers: - - state: mindbreaker - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml deleted file mode 100644 index 9ff83bfd486..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ /dev/null @@ -1,261 +0,0 @@ -- type: entity - name: energy gun - parent: BaseWeaponBattery - id: WeaponEnergyGun - description: "A basic hybrid energy gun with two settings: disable and kill." - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mode-disabler - shader: unshaded - map: [ "Firemode" ] - - state: mag-unshaded-4 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi - - type: Gun - soundGunshot: - path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg - soundEmpty: - path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg - - type: Battery - maxCharge: 1000 - startingCharge: 1000 - - type: ProjectileBatteryAmmoProvider - proto: BulletDisabler - fireCost: 50 - - type: EnergyGun - fireModes: - - proto: BulletDisabler - fireCost: 50 - name: disable - state: disabler - - proto: BulletEnergyGunLaser - fireCost: 100 - name: lethal - state: lethal - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: true - - type: Appearance - - type: GenericVisualizer - visuals: - enum.EnergyGunFireModeVisuals.State: - Firemode: - Disabler: { state: mode-disabler } - Lethal: { state: mode-lethal } - Special: { state: mode-stun } # Unused - -- type: entity - name: x-01 multiphase energy gun - parent: BaseWeaponBatterySmall - id: WeaponEnergyGunMultiphase - description: This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mode-disabler - shader: unshaded - map: [ "Firemode" ] - - state: mag-unshaded-4 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi - - type: Gun - soundGunshot: - path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg - soundEmpty: - path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg - - type: Battery - maxCharge: 1000 - startingCharge: 1000 - - type: ProjectileBatteryAmmoProvider - proto: BulletDisabler - fireCost: 50 - - type: EnergyGun - fireModes: - - proto: BulletDisabler - fireCost: 50 - name: disable - state: disabler - - proto: BulletEnergyGunLaser - fireCost: 100 - name: lethal - state: lethal - # - proto: BulletEnergyGunIon - # fireCost: 250 - # name: ion - # state: special - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: true - - type: Appearance - - type: GenericVisualizer - visuals: - enum.EnergyGunFireModeVisuals.State: - Firemode: - Disabler: { state: mode-disabler } - Lethal: { state: mode-lethal } - Special: { state: mode-ion } - - type: Tag - tags: - - HighRiskItem - - Sidearm - - type: StaticPrice - price: 750 - - type: StealTarget - stealGroup: WeaponEnergyGunMultiphase - -- type: entity - name: miniature energy gun - parent: BaseWeaponBatterySmall - id: WeaponEnergyGunMini - description: A light version of the Energy gun with a smaller capacity. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mode-disabler - shader: unshaded - map: [ "Firemode" ] - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi - - type: Gun - soundGunshot: - path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg - soundEmpty: - path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg - - type: Battery - maxCharge: 500 - startingCharge: 500 - - type: ProjectileBatteryAmmoProvider - proto: BulletDisabler - fireCost: 50 - - type: EnergyGun - fireModes: - - proto: BulletDisabler - fireCost: 50 - name: disable - state: disabler - - proto: BulletEnergyGunLaser - fireCost: 100 - name: lethal - state: lethal - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: true - - type: Appearance - - type: GenericVisualizer - visuals: - enum.EnergyGunFireModeVisuals.State: - Firemode: - Disabler: { state: mode-disabler } - Lethal: { state: mode-lethal } - Special: { state: mode-stun } # Unused - -- type: entity - name: PDW-9 Energy Pistol - parent: BaseWeaponBatterySmall - id: WeaponEnergyGunPistol - description: A military grade sidearm, used by many militia forces throughout the local sector. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mode-disabler - shader: unshaded - map: [ "Firemode" ] - - state: mag-unshaded-4 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi - - type: Gun - soundGunshot: - path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg - soundEmpty: - path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg - - type: Battery - maxCharge: 800 - startingCharge: 800 - - type: ProjectileBatteryAmmoProvider - proto: BulletDisabler - fireCost: 50 - - type: EnergyGun - fireModes: - - proto: BulletDisabler - fireCost: 50 - name: disable - state: disabler - - proto: BulletEnergyGunLaser - fireCost: 100 - name: lethal - state: lethal - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: true - - type: Appearance - - type: GenericVisualizer - visuals: - enum.EnergyGunFireModeVisuals.State: - Firemode: - Disabler: { state: mode-disabler } - Lethal: { state: mode-lethal } - - type: Tag - tags: - - Sidearm - - type: StaticPrice - price: 750 - -- type: entity - name: IK-60 laser carbine - parent: BaseWeaponBattery - id: WeaponGunLaserCarbineAutomatic - description: "A 20 round semi-automatic laser carbine." - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-unshaded-4 - map: ["enum.GunVisualLayers.MagUnshaded"] - shader: unshaded - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi - - type: Gun - soundGunshot: - path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg - soundEmpty: - path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg - selectedMode: SemiAuto - fireRate: 3 - availableModes: - - SemiAuto - - type: Battery - maxCharge: 2000 - startingCharge: 2000 - - type: ProjectileBatteryAmmoProvider - proto: BulletEnergyGunLaser - fireCost: 100 - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: true - - type: Appearance diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml deleted file mode 100644 index 9fb68453ee3..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ /dev/null @@ -1,41 +0,0 @@ -- type: entity - name: Experimental L6 SAW - parent: BaseItem - id: WeaponLightMachineGunL6Borg - description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses replicated .30 rifle ammo generated internally. - components: - - type: Sprite - sprite: Objects/Weapons/Guns/LMGs/l6.rsi - netsync: false - layers: - - state: base - map: [ "enum.GunVisualLayers.Base" ] - - type: Item - size: Huge - - type: Gun - minAngle: 4 - maxAngle: 20 - angleIncrease: 4 - angleDecay: 16 - fireRate: 5 - selectedMode: FullAuto - availableModes: - - FullAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/lmg.ogg - soundEmpty: - path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg - - type: Battery - maxCharge: 800 - startingCharge: 500 - - type: ProjectileBatteryAmmoProvider - proto: CartridgeLightRifleReplicated - fireCost: 20 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 5 - - type: AmmoCounter -# - type: DynamicPrice -# price: 500 - - type: Appearance - diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml deleted file mode 100644 index 0775b414aba..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: entity - name: china lake - parent: BaseWeaponLauncher - suffix: Robot, energy based - id: WeaponLauncherChinaLakeBorg - description: PLOOP! Contains a built in replicator to slowly make more ammo. - components: - - type: Sprite - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - layers: - - state: icon - map: ["enum.GunVisualLayers.Base"] - - type: Clothing - sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi - - type: Gun - fireRate: 1 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg - - type: Battery - maxCharge: 600 - startingCharge: 300 - - type: ProjectileBatteryAmmoProvider - proto: GrenadeFrag - fireCost: 300 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 2 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml deleted file mode 100644 index 6f4d5b52301..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ /dev/null @@ -1,110 +0,0 @@ -- type: entity - name: viper - parent: BaseWeaponPistol - id: WeaponPistolViperWood - description: A small, low-power pistol with pleasant lacquered wooden grips. Uses .35 auto ammo. - suffix: Wood - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistol - insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 - whitelist: - tags: - - MagazinePistol - - MagazinePistolHighCapacity - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - -- type: entity - name: Pollock - parent: BaseWeaponPistol - id: WeaponPistolPollock - description: A compact and mass-produced combat pistol. Uses .35 auto ammo. - suffix: Mercenary - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi - - type: Gun - fireRate: 5 - availableModes: - - SemiAuto - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistol - insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 - whitelist: - tags: - - MagazinePistol - - MagazinePistolHighCapacity - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - -- type: entity - name: psi-breaker - parent: BaseWeaponPistol - id: WeaponPistolPsiBreaker - description: A small, flashy pistol with a marble style grip. Provides no tactical advantage. Uses .38 special ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi - - type: Gun - fireRate: 3.5 - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/pistol.ogg - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistolSpecialMindbreaker - insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg - priority: 2 - whitelist: - tags: - - MagazinePistolSpecial - gun_chamber: - name: Chamber - startingItem: CartridgeSpecialMindbreaker - priority: 1 - whitelist: - tags: - - CartridgeSpecial - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml deleted file mode 100644 index 936ac9856ec..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml +++ /dev/null @@ -1,18 +0,0 @@ -- type: entity - id: BulletImpactEffectRedDisabler - noSpawn: true - components: - - type: TimedDespawn - lifetime: 0.2 - - type: Sprite - drawdepth: Effects - layers: - - shader: unshaded - map: ["enum.EffectLayers.Unshaded"] - sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi - state: impact_laser_greyscale - color: red - - type: EffectVisuals - - type: Tag - tags: - - HideContextMenu diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml deleted file mode 100644 index a19a21dd924..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ /dev/null @@ -1,127 +0,0 @@ -- type: entity - name: snubbed .45 - parent: BaseWeaponRevolver - id: WeaponRevolverSnub - description: An old and reliable revolver, modified to be more easily concealed. Uses .45 magnum ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi - - type: Gun - selectedMode: SemiAuto - minAngle: 5 - maxAngle: 30 - angleIncrease: 25 - angleDecay: 5 - fireRate: 2.5 - availableModes: - - SemiAuto - - type: RevolverAmmoProvider - capacity: 6 - chambers: [ True, True, True, True, True, True ] - ammoSlots: [ null, null, null, null, null, null ] - -- type: entity - name: k-38 masterpiece - parent: BaseWeaponRevolver - id: WeaponRevolverK38Master - description: A classic, if not outdated, law enforcement firearm. Uses .38 special ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi - - type: Gun - selectedMode: SemiAuto - fireRate: 2 - availableModes: - - SemiAuto - - type: RevolverAmmoProvider - whitelist: - tags: - - CartridgeSpecial - - SpeedLoaderSpecial - proto: CartridgeSpecialRubber - capacity: 6 - chambers: [ True, True, True, True, True, True ] - ammoSlots: [ null, null, null, null, null, null ] - -- type: entity - name: fitz special - parent: BaseWeaponRevolver - id: WeaponRevolverFitz - description: A compact and concealable self defence snub revolver. Uses .38 special ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi - - type: Gun - selectedMode: SemiAuto - fireRate: 1.75 - availableModes: - - SemiAuto - - type: RevolverAmmoProvider - whitelist: - tags: - - CartridgeSpecial - - SpeedLoaderSpecial - proto: CartridgeSpecialRubber - capacity: 6 - chambers: [ True, True, True, True, True, True ] - ammoSlots: [ null, null, null, null, null, null ] - -- type: entity - name: lucky 37 - parent: BaseWeaponRevolver - id: WeaponRevolverLucky - description: Luck always beats skill, ya weasel. Uses .38 special ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi - - type: Gun - selectedMode: SemiAuto - fireRate: 2 - availableModes: - - SemiAuto - - type: RevolverAmmoProvider - whitelist: - tags: - - CartridgeSpecial - - SpeedLoaderSpecial - proto: CartridgeSpecial - capacity: 6 - chambers: [ True, True, True, True, True, True ] - ammoSlots: [ null, null, null, null, null, null ] - - type: StaticPrice - price: 750 - -- type: entity - name: faith - parent: BaseWeaponRevolver - id: WeaponRevolverFaith - description: Delivers blessings in bullet form. Uses .38 special ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi - - type: Gun - selectedMode: SemiAuto - fireRate: 1.5 - availableModes: - - SemiAuto - - type: RevolverAmmoProvider - whitelist: - tags: - - CartridgeSpecial - - SpeedLoaderSpecial - proto: CartridgeSpecialHoly - capacity: 4 - chambers: [ True, True, True, True ] - ammoSlots: [ null, null, null, null ] - - type: StaticPrice - price: 1500 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml deleted file mode 100644 index 5dba7d27f1e..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ /dev/null @@ -1,175 +0,0 @@ -- type: entity - name: Vulcan - parent: BaseWeaponRifle - id: WeaponRifleVulcan - description: One of the first firearms modified for space usage, this rifle was purpose-designed to punch holes in Cargonian "combat mechs." Uses .30 rifle ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Gun - fireRate: 2 - selectedMode: SemiAuto - availableModes: - - SemiAuto - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineLightRifle - insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineLightRifle - gun_chamber: - name: Chamber - startingItem: CartridgeLightRifle - priority: 1 - whitelist: - tags: - - CartridgeLightRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi - -- type: entity - name: CAWS-25 Jackdaw - parent: BaseWeaponRifle - id: WeaponRifleJackdaw - description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo. - suffix: Deathsquad - components: - - type: Item - size: Large - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Gun - minAngle: 2 - maxAngle: 6 - angleIncrease: 2 - angleDecay: 8 - fireRate: 8 - selectedMode: FullAuto - availableModes: - - SemiAuto - - FullAuto - soundGunshot: - path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineCaselessRifle - insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineCaselessRifle - gun_chamber: - name: Chamber - startingItem: CartridgeCaselessRifle - priority: 1 - whitelist: - tags: - - CartridgeCaselessRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi - -- type: entity - name: Tenebra - parent: BaseWeaponRifle - id: WeaponRifleTenebra - description: A mass-produced and minimalist rifle in bullpup design. Uses .20 rifle ammo. - suffix: Mercenary - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Gun - minAngle: 3 - maxAngle: 12 - angleIncrease: 3 - angleDecay: 12 - fireRate: 5 - selectedMode: FullAuto - availableModes: - - SemiAuto - - FullAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazineRifle - insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazineRifle - gun_chamber: - name: Chamber - startingItem: CartridgeRifle - priority: 1 - whitelist: - tags: - - CartridgeRifle - - type: ContainerContainer - containers: - gun_magazine: !type:ContainerSlot - gun_chamber: !type:ContainerSlot - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi - -- type: entity - name: M-90 - id: WeaponRifleM90 - parent: WeaponRifleM90GrenadeLauncher - description: An older bullpup carbine model. Uses .20 rifle ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml deleted file mode 100644 index e9122ff47fb..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ /dev/null @@ -1,47 +0,0 @@ -- type: entity - name: Typewriter - parent: BaseWeaponSubMachineGun - id: WeaponSubMachineGunTypewriter - description: A modern take on the classic design used by mobsters throughout space and time. Types .35 auto ammo. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-0 - map: ["enum.GunVisualLayers.Mag"] - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi - - type: Gun - minAngle: 1 - maxAngle: 15 - angleIncrease: 5 - angleDecay: 20 - fireRate: 8 - soundGunshot: - path: /Audio/DeltaV/Weapons/Guns/Gunshots/typewriter.ogg - - type: ChamberMagazineAmmoProvider - - type: ItemSlots - slots: - gun_magazine: - name: Magazine - startingItem: MagazinePistolSubMachineGun - insertSound: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg - ejectSound: /Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg - priority: 2 - whitelist: - tags: - - MagazinePistolSubMachineGun - gun_chamber: - name: Chamber - startingItem: CartridgePistol - priority: 1 - whitelist: - tags: - - CartridgePistol - - type: MagazineVisuals - magState: mag - steps: 1 - zeroVisible: true - - type: Appearance diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml deleted file mode 100644 index d3424de0061..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ /dev/null @@ -1,45 +0,0 @@ -- type: entity - name: adjutant - parent: BaseWeaponShotgun - id: WeaponShotgunAdjutant - description: Sold as a "riot" shotgun, this shotgun has a special gas-operated mechanism that makes it highly effective for CQC and suppressive fire. - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi - - type: Item - size: Large - - type: Gun - fireRate: 1.5 - selectedMode: SemiAuto - availableModes: - - SemiAuto - soundGunshot: - path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg - soundEmpty: - path: /Audio/Weapons/Guns/Empty/empty.ogg - - type: BallisticAmmoProvider -# autoCycle: true - whitelist: - tags: - - ShellShotgun - capacity: 6 - proto: ShellShotgun - soundInsert: - path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg - -- type: entity - name: Kammerer - parent: BaseWeaponShotgun - id: WeaponShotgunKammererNonLethal #Legacy name - description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. - suffix: Beanbag - components: - - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V - - type: Clothing - sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V - - type: BallisticAmmoProvider - capacity: 4 - proto: ShellShotgunBeanbag diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml deleted file mode 100644 index 2e60a19c4a7..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ /dev/null @@ -1,15 +0,0 @@ -- type: entity - parent: AirlockScience - id: AirlockMantisLocked - suffix: Mantis, Locked - components: - - type: AccessReader - access: [["Mantis"]] - -- type: entity - parent: AirlockScienceGlass - id: AirlockMantisGlassLocked - suffix: Mantis, Locked - components: - - type: AccessReader - access: [["Mantis"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml deleted file mode 100644 index d27a8d8e70e..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Windoors/windoor.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: entity - parent: Windoor - id: WindoorMailLocked - suffix: Mail, Locked - components: - - type: AccessReader - access: [["Mail"]] - -- type: entity - parent: WindoorSecure - id: WindoorSecureMailLocked - suffix: Mail, Locked - components: - - type: AccessReader - access: [["Mail"]] - -- type: entity - parent: WindoorSecure - id: WindoorSecureParamedicLocked - suffix: Paramedic, Locked - components: - - type: AccessReader - access: [["Paramedic"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/faxmachines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/faxmachines.yml deleted file mode 100644 index 550aaed534b..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/faxmachines.yml +++ /dev/null @@ -1,20 +0,0 @@ -#Delta-V - This file is licensed under AGPLv3 -# Copyright (c) 2024 Delta-V Contributors -# See AGPLv3.txt for details. - -- type: entity - parent: FaxMachineBase - id: FaxMachineListeningSyndie - name: listening post long range fax machine - suffix: Syndicate - components: - - type: Sprite - sprite: DeltaV/Structures/Machines/syndicate_fax_machine.rsi - layers: - - state: icon - map: [ "base" ] - color: "#a3a3a3" - - type: FaxMachine - name: "Unknown?" - responsePings: false - - type: Emagged diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml deleted file mode 100644 index fad87f577fc..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/vending_machines.yml +++ /dev/null @@ -1,50 +0,0 @@ -- type: entity - parent: VendingMachine - id: VendingMachinePride - name: Pride-O-Mat - description: A vending machine containing crimes. - components: - - type: VendingMachine - pack: PrideDrobeInventory - offState: off - brokenState: broken - normalState: normal-unshaded - - type: Advertise - pack: PrideDrobeAds - - type: Speech - - type: Sprite - sprite: DeltaV/Structures/Machines/VendingMachines/pride.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - -- type: entity - parent: VendingMachine - id: VendingMachineCourierDrobe - name: CourierDrobe - description: Neither solar flares nor meteors nor plasma fire nor void of space stays these couriers from the swift completion of their appointed rounds. - components: - - type: VendingMachine - pack: CourierDrobeInventory - offState: off - brokenState: broken - normalState: normal-unshaded - - type: Advertise - pack: CourierDrobeAds - - type: Sprite - sprite: DeltaV/Structures/Machines/VendingMachines/courierdrobe.rsi - layers: - - state: "off" - map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" - map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] - shader: unshaded - - state: panel - map: ["enum.WiresVisualLayers.MaintenancePanel"] - - type: AccessReader - access: [["Mail"]] diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Tanks/tanks.yml deleted file mode 100644 index 5368f805a7e..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Tanks/tanks.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Kvass -- type: entity - id: KvassTank - parent: StorageTank - suffix: Empty - components: - - type: Sprite - sprite: DeltaV/Structures/Storage/kvass.rsi - state: kvass - -- type: entity - parent: KvassTank - id: KvassTankFull - suffix: Full - components: - - type: SolutionContainerManager - solutions: - tank: - reagents: - - ReagentId: Kvass - Quantity: 1500 diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml deleted file mode 100644 index b0548d0e1bd..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/posters.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - parent: PosterBase - id: PosterLegitFuckAround - name: Fuck Around... - description: ...and find out. Sponsored by the Intergalactic Bartenders' Federation, Delta branch. - components: - - type: Sprite - sprite: DeltaV/Structures/Wallmounts/Posters/TJohnson.rsi - state: fuckaround - -- type: entity - parent: PosterBase - id: PosterContrabandGotWood - name: "Got Wood?" - description: "A grimy old advert for a seedy lumber company. \"You got a friend in me.\" is scrawled in the corner." - components: - - type: Sprite - sprite: DeltaV/Structures/Wallmounts/Posters/misc.rsi - state: woodygotwood diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml deleted file mode 100644 index 6129ff6c413..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/Signs/signs.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: entity - parent: BaseSignDirectional - id: SignDirectionalLogistics - name: logistics sign - description: A direction sign, pointing out which way the Logistics department is. - components: - - type: Sprite - sprite: DeltaV/Structures/Wallmounts/signs.rsi - state: direction_logi - -- type: entity - parent: BaseSignDirectional - id: SignDirectionalMail - name: mailroom sign - description: A direction sign, pointing out which way the mailroom is. - components: - - type: Sprite - sprite: DeltaV/Structures/Wallmounts/signs.rsi - state: direction_mail diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/cryopod.yml b/Resources/Prototypes/DeltaV/Entities/Structures/cryopod.yml deleted file mode 100644 index cec45e30fcb..00000000000 --- a/Resources/Prototypes/DeltaV/Entities/Structures/cryopod.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: CryogenicSleepUnit - id: CryogenicSleepUnitSpawnerPrisoner - suffix: Spawner, Prisoner - components: - - type: ContainerSpawnPoint - containerId: storage - spawnType: Job - job: Prisoner diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml deleted file mode 100644 index f3c7876a8af..00000000000 --- a/Resources/Prototypes/DeltaV/Flavors/flavors.yml +++ /dev/null @@ -1,117 +0,0 @@ -#Nyano - -- type: flavor - id: enthralling - flavorType: Complex - description: flavor-complex-enthralling - -- type: flavor - id: sublime - flavorType: Complex - description: flavor-complex-sublime - -- type: flavor - id: holy - flavorType: Complex - description: flavor-complex-holy - -- type: flavor - id: seeds - flavorType: Base - description: flavor-base-seeds - -- type: flavor - id: cotton - flavorType: Complex - description: flavor-complex-cotton - -- type: flavor - id: vanilla - flavorType: Complex - description: flavor-complex-vanilla - -- type: flavor - id: soju - flavorType: Complex - description: flavor-complex-soju - -- type: flavor - id: orangecreamcicle - flavorType: Complex - description: flavor-complex-orangecreamcicle - -- type: flavor - id: silverjack - flavorType: Complex - description: flavor-complex-silverjack - -- type: flavor - id: brainbomb - flavorType: Complex - description: flavor-complex-brainbomb - -- type: flavor - id: atomicpunch - flavorType: Complex - description: flavor-complex-atomicpunch - -- type: flavor - id: circusjuice - flavorType: Complex - description: flavor-complex-circusjuice - -- type: flavor - id: pinkdrink - flavorType: Complex - description: flavor-complex-pinkdrink - -- type: flavor - id: sapopicante - flavorType: Complex - description: flavor-complex-sapopicante - -- type: flavor - id: graveyard - flavorType: Complex - description: flavor-complex-graveyard - -- type: flavor - id: bubbletea - flavorType: Complex - description: flavor-complex-bubbletea - -- type: flavor - id: corncob - flavorType: Complex - description: flavor-complex-corncob - -#Delta V -- type: flavor - id: dulleavene - flavorType: Complex - description: flavor-complex-dulleavene - -- type: flavor - id: gunmetal - flavorType: Complex - description: flavor-complex-gunmetal - -- type: flavor - id: lemondrop - flavorType: Complex - description: flavor-complex-lemondrop - -- type: flavor - id: greengrass - flavorType: Complex - description: flavor-complex-greengrass - -- type: flavor - id: daiquiri - flavorType: Complex - description: flavor-complex-daiquiri - -- type: flavor - id: arsonistsbrew - flavorType: Complex - description: flavor-complex-arsonistsbrew diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml deleted file mode 100644 index 73b0ca6549c..00000000000 --- a/Resources/Prototypes/DeltaV/GameRules/events.yml +++ /dev/null @@ -1,63 +0,0 @@ -- type: entity - id: XenoVents - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - startAnnouncement: station-event-xeno-vent-start-announcement - startAudio: - path: /Audio/Announcements/aliens.ogg - earliestStart: 20 - minimumPlayers: 15 - weight: 1 - duration: 60 - - type: VentCrittersRule - entries: - - id: MobXeno - prob: 0.01 - - id: MobXenoRouny - prob: 0.005 - - id: MobXenoDrone - prob: 0.005 - - id: MobXenoSpitter - prob: 0.005 - - id: MobXenoRunner - prob: 0.005 - - id: MobXenoPraetorian - prob: 0.005 - - id: MobXenoRavager - prob: 0.005 - - id: MobXenoQueen - prob: 0.005 - -- type: entity - id: MothroachSpawn - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - id: VentCritters - earliestStart: 15 - minimumPlayers: 15 - weight: 4 - duration: 60 - - type: VentCrittersRule - entries: - - id: MobMothroach - prob: 0.05 - -- type: entity # Delta-V : Midround Syndie Listening Station Spawn - id: PirateRadioSpawn - parent: BaseGameRule - noSpawn: true - components: - - type: StationEvent - earliestStart: 15 - weight: 5 - minimumPlayers: 25 - maxOccurrences: 1 - duration: 1 - - type: PirateRadioSpawnRule - debrisCount: 6 - distanceModifier: 13 - debrisDistanceModifier: 3 diff --git a/Resources/Prototypes/DeltaV/GameRules/midround.yml b/Resources/Prototypes/DeltaV/GameRules/midround.yml deleted file mode 100644 index 82b47c05718..00000000000 --- a/Resources/Prototypes/DeltaV/GameRules/midround.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: entity - noSpawn: true - parent: BaseGameRule - id: ParadoxAnomaly - components: - - type: GenericAntagRule - agentName: paradox-anomaly-round-end-agent-name - objectives: - - ParadoxAnomalyKillObjective - - ParadoxAnomalyFriendObjective - - ParadoxAnomalyEscapeObjective diff --git a/Resources/Prototypes/DeltaV/Maps/salvage.yml b/Resources/Prototypes/DeltaV/Maps/salvage.yml deleted file mode 100644 index dfdbf7c095e..00000000000 --- a/Resources/Prototypes/DeltaV/Maps/salvage.yml +++ /dev/null @@ -1,40 +0,0 @@ -# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5 - -- type: salvageMap - id: AsteroidSyndiHideout - mapPath: /Maps/Salvage/DeltaV/DV-syndi-hideout.yml - size: medium - -# """Large""" maps - -- type: salvageMap - id: AsteroidChemlab - mapPath: /Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml - size: large - -- type: salvageMap - id: LaundromatChunk - mapPath: /Maps/Salvage/DeltaV/DV-laundromat-chunk.yml - size: large - -# Asteroids - -- type: salvageMap - id: AsteroidTickNest - mapPath: /Maps/Salvage/DeltaV/DV-tick-nest.yml - -- type: salvageMap - id: AsteroidMiningMed1 - mapPath: /Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml - -- type: salvageMap - id: AsteroidMiningLarge1 - mapPath: /Maps/Salvage/DeltaV/DV-med-asteroid-mining-01.yml - -- type: salvageMap - id: AsteroidCrystalCave - mapPath: /Maps/Salvage/DeltaV/DV-crystal-cave.yml - -- type: salvageMap - id: AsteroidBoneCave - mapPath: /Maps/Salvage/DeltaV/DV-bone-cave.yml diff --git a/Resources/Prototypes/DeltaV/Maps/salvage_modified.yml b/Resources/Prototypes/DeltaV/Maps/salvage_modified.yml deleted file mode 100644 index 662bf302c36..00000000000 --- a/Resources/Prototypes/DeltaV/Maps/salvage_modified.yml +++ /dev/null @@ -1,100 +0,0 @@ -# Override for /Prototypes/Maps/salvage.yml - -# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5 - -- type: salvageMap - id: DVOutpostArm - mapPath: /Maps/Salvage/DeltaV/DV-outpost-arm.yml - size: medium - -- type: salvageMap - id: DVMedium1 - mapPath: /Maps/Salvage/DeltaV/DV-medium-01.yml - size: medium - -- type: salvageMap - id: DVMediumVault1 - mapPath: /Maps/Salvage/DeltaV/DV-med-vault-01.yml - size: medium - -- type: salvageMap - id: DVMediumOrchestra - mapPath: /Maps/Salvage/DeltaV/DV-med-silent-orchestra.yml - size: medium - -- type: salvageMap - id: DVMediumLibraryWreck - mapPath: /Maps/Salvage/DeltaV/DV-med-library.yml - size: medium - -- type: salvageMap - id: DVMediumCargoWreck - mapPath: /Maps/Salvage/DeltaV/DV-cargo-01.yml - size: medium - -- type: salvageMap - id: DVMediumPirateWreck - mapPath: /Maps/Salvage/DeltaV/DV-med-pirate.yml - size: medium - -- type: salvageMap - id: DVTickColony - mapPath: /Maps/Salvage/DeltaV/DV-tick-colony.yml - size: medium - -- type: salvageMap - id: DVCargoDock - mapPath: /Maps/Salvage/DeltaV/DV-med-dock.yml - size: medium - -- type: salvageMap - id: DVSpaceWaffleHome - mapPath: /Maps/Salvage/DeltaV/DV-wh-salvage.yml - size: medium - -- type: salvageMap - id: DVMediumShuttleWreck - mapPath: /Maps/Salvage/DeltaV/DV-med-ruined-emergency-shuttle.yml - size: medium - -- type: salvageMap - id: DVmediumPetHospital - mapPath: /Maps/Salvage/DeltaV/DV-med-pet-hospital.yml - size: medium - -- type: salvageMap - id: DVMediumCrashedShuttle - mapPath: /Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml - size: medium - -- type: salvageMap - id: DVMeatball - mapPath: /Maps/Salvage/DeltaV/DV-meatball.yml - size: medium - -- type: salvageMap - id: DVMediumHaulingShuttleWreck - mapPath: /Maps/Salvage/DeltaV/DV-hauling-shuttle.yml - size: medium - -# """Large""" maps - -- type: salvageMap - id: DVStationStation - mapPath: /Maps/Salvage/DeltaV/DV-stationstation.yml - size: large - -- type: salvageMap - id: DVAsteroidBase - mapPath: /Maps/Salvage/DeltaV/DV-asteroid-base.yml - size: large - -- type: salvageMap - id: DVRuinCargoBase - mapPath: /Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml - size: large - -- type: salvageMap - id: DVSecurityChunk - mapPath: /Maps/Salvage/DeltaV/DV-security-chunk.yml - size: large diff --git a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml b/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml deleted file mode 100644 index cf7d4f90d68..00000000000 --- a/Resources/Prototypes/DeltaV/Objectives/stealTargetGroups.yml +++ /dev/null @@ -1,20 +0,0 @@ -- type: stealTargetGroup - id: SpaceCashLuckyBill - name: logistics officer's lucky bill - sprite: - sprite: DeltaV/Objects/Misc/first_bill.rsi - state: icon - -- type: stealTargetGroup - id: BookIanDossier - name: head of personnel's photobook - sprite: - sprite: DeltaV/Objects/Misc/bureaucracy.rsi - state: folder-hop-ian - -- type: stealTargetGroup - id: WeaponEnergyGunMultiphase - name: x-01 multiphase energy gun - sprite: - sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi - state: base diff --git a/Resources/Prototypes/DeltaV/Objectives/traitor.yml b/Resources/Prototypes/DeltaV/Objectives/traitor.yml deleted file mode 100644 index 4fa25f26987..00000000000 --- a/Resources/Prototypes/DeltaV/Objectives/traitor.yml +++ /dev/null @@ -1,34 +0,0 @@ -- type: entity # Logistics Officer steal objective. - noSpawn: true - parent: BaseTraitorStealObjective - id: LOLuckyBillStealObjective - components: - - type: NotJobRequirement - job: Quartermaster - - type: StealCondition - stealGroup: SpaceCashLuckyBill - # owner: job-name-qm - -- type: entity # Head of Personnel steal objective. - noSpawn: true - parent: BaseTraitorStealObjective - id: HoPBookIanDossierStealObjective - components: - - type: NotJobRequirement - job: HeadOfPersonnel - - type: StealCondition - stealGroup: BookIanDossier - # owner: job-name-hop - -- type: entity # Head of Security steal objective. - noSpawn: true - parent: BaseTraitorStealObjective - id: HoSGunStealObjective - components: - - type: Objective - difficulty: 3 # HoS will mostly be using the gun to stop you from stealing it - - type: NotJobRequirement - job: HeadOfSecurity - - type: StealCondition - stealGroup: WeaponEnergyGunMultiphase - owner: job-name-hos diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml deleted file mode 100644 index 816aa574448..00000000000 --- a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml +++ /dev/null @@ -1,185 +0,0 @@ -- type: reagent - id: HealthViolation - name: reagent-name-healthviolation - parent: BaseDrink - desc: reagent-desc-healthviolation - physicalDesc: reagent-physical-desc-strong-smelling - flavor: dulleavene - color: "#ff7f00" - metamorphicSprite: - sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.3 - - !type:PopupMessage - conditions: - - !type:ReagentThreshold - min: 30 - type: Local - visualType: Medium - messages: [ "generic-reagent-effect-damnation" ] - probability: 0.2 - - !type:ChemVomit - conditions: - - !type:ReagentThreshold - min: 30 - probability: 0.02 - -- type: reagent - id: Gunmetal #Credit to DinkusMcsplinkus for inspiring this drink. This could've also been called "Creamy Ignition" - name: reagent-name-gunmetal - parent: BaseDrink - desc: reagent-desc-gunmetal - physicalDesc: reagent-physical-desc-strong-smelling - flavor: gunmetal - color: "#994422" - metamorphicSprite: - sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.20 - Poison: - effects: - - !type:HealthChange - damage: - types: - Poison: 0.5 - -- type: reagent - id: LemonDrop - name: reagent-name-lemondrop - parent: BaseDrink - desc: reagent-desc-lemondrop - physicalDesc: reagent-physical-desc-lemony-fresh - flavor: lemondrop - color: "#fff789" - metamorphicSprite: - sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.15 - -- type: reagent - id: GreenGrass - name: reagent-name-greengrass - parent: BaseDrink - desc: reagent-desc-greengrass - physicalDesc: reagent-physical-desc-tangy - flavor: greengrass - color: "#66aa55" - metamorphicSprite: - sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.05 - -- type: reagent - id: Daiquiri - name: reagent-name-daiquiri - parent: BaseDrink - desc: reagent-desc-daiquiri - physicalDesc: reagent-physical-desc-tart - flavor: daiquiri - color: "#ddffdd" - metamorphicSprite: - sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.25 - -- type: reagent - id: ArsonistsBrew - name: reagent-name-arsonistsbrew - parent: BaseDrink - desc: reagent-desc-arsonistsbrew - physicalDesc: reagent-physical-desc-volatile - flavor: arsonistsbrew - color: "#fff789" - metamorphicSprite: - sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.30 - Poison: - effects: - - !type:HealthChange - damage: - types: - Heat: 2 - - !type:FlammableReaction - multiplier: 0.5 - - !type:Ignite - - !type:Emote - emote: Laugh - probability: 0.25 - -- type: reagent - id: Kvass - name: reagent-name-kvass - parent: BaseDrink - desc: reagent-desc-kvass - physicalDesc: reagent-physical-desc-bubbly - flavor: bread - color: "#381600" - metamorphicSprite: - sprite: Objects/Consumable/Drinks/kvass.rsi - state: icon - -- type: reagent - id: Mothamphetamine - name: reagent-name-mothamphetamine - parent: BaseDrink - desc: reagent-desc-mothamphetamine - physicalDesc: reagent-physical-desc-fuzzy - flavor: cotton - color: "#2fa1ef" - metamorphicSprite: - sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi - state: icon - metabolisms: - Drink: - effects: - - !type:SatiateThirst - factor: 2 - - !type:AdjustReagent - reagent: Ethanol - amount: 0.25 - Poison: - effects: - - !type:Jitter diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml deleted file mode 100644 index 386a0211c03..00000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Construction/clothing.yml +++ /dev/null @@ -1,21 +0,0 @@ -- type: construction - name: prescription medhud - id: ClothingEyesPrescriptionMedHud - graph: PrescriptionMedHud - startNode: start - targetNode: prescmedhud - category: construction-category-clothing - description: Prescription medhud, merged glasses and medhud together by sheer luck and cables with glue. - icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi, state: icon } - objectType: Item - -- type: construction - name: prescription sechud - id: ClothingEyesPrescriptionHudSecurity - graph: PrescriptionSecHud - startNode: start - targetNode: prescsechud - category: construction-category-clothing - description: Prescription sechud, merged glasses and sechud together by sheer luck and cables with glue. - icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi, state: icon } - objectType: Item diff --git a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml deleted file mode 100644 index 2533bff44bb..00000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Cooking/meal_recipes.yml +++ /dev/null @@ -1,31 +0,0 @@ -- type: microwaveMealRecipe - id: RecipeGrilledCheese - name: grilled cheese - result: FoodMealGrilledCheese - time: 10 - solids: - FoodBreadPlainSlice: 2 - FoodCheeseSlice: 1 - FoodButter: 1 - -- type: microwaveMealRecipe - id: RecipeScrambledEggs - name: scrambled eggs recipe - result: FoodMealScrambledEggs - time: 5 - reagents: - TableSalt: 5 - solids: - FoodBowlBig: 1 - FoodEgg: 3 - FoodButter: 1 - -- type: microwaveMealRecipe - id: RecipePumpkinPie - name: pumpkin pie - result: FoodPiePumpkin - time: 15 - solids: - FoodDoughPie: 1 - FoodPumpkin: 1 - FoodPlateTin: 1 diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml deleted file mode 100644 index b0b469d05cd..00000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/clothing.yml +++ /dev/null @@ -1,82 +0,0 @@ -# Jumpsuits - Security - -- type: latheRecipe - id: ClothingUniformJumpsuitSecBlue - result: ClothingUniformJumpsuitSecBlue - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpsuitSecGrey - result: ClothingUniformJumpsuitSecGrey - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpsuitWardenBlue - result: ClothingUniformJumpsuitWardenBlue - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpsuitWardenGrey - result: ClothingUniformJumpsuitWardenGrey - completetime: 4 - materials: - Cloth: 300 - -# Jumpskirts - Security - -- type: latheRecipe - id: ClothingUniformJumpskirtSecBlue - result: ClothingUniformJumpskirtSecBlue - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpskirtSecGrey - result: ClothingUniformJumpskirtSecGrey - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpskirtHoSBlue - result: ClothingUniformJumpskirtHoSBlue - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpskirtHoSGrey - result: ClothingUniformJumpskirtHoSGrey - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpskirtWardenBlue - result: ClothingUniformJumpskirtWardenBlue - completetime: 4 - materials: - Cloth: 300 - -- type: latheRecipe - id: ClothingUniformJumpskirtWardenGrey - result: ClothingUniformJumpskirtWardenGrey - completetime: 4 - materials: - Cloth: 300 - -# Security Sweater - -- type: latheRecipe - id: ClothingOuterStasecSweater - result: ClothingOuterStasecSweater - completetime: 4 - materials: - Cloth: 500 diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/electronics.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/electronics.yml deleted file mode 100644 index 82e0294e828..00000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/electronics.yml +++ /dev/null @@ -1,8 +0,0 @@ -- type: latheRecipe - id: SalvageExpeditionsComputerCircuitboard - result: SalvageExpeditionsComputerCircuitboard - completetime: 4 - materials: - Steel: 100 - Glass: 900 - Silver: 100 diff --git a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml b/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml deleted file mode 100644 index cd79417a44e..00000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Lathes/security.yml +++ /dev/null @@ -1,180 +0,0 @@ -- type: latheRecipe - id: SpeedLoaderSpecial - result: SpeedLoaderSpecial - category: Ammo - completetime: 5 - materials: - Steel: 200 - -- type: latheRecipe - id: MagazinePistolSpecial - result: MagazinePistolSpecial - category: Ammo - completetime: 5 - materials: - Steel: 100 - -- type: latheRecipe - id: CartridgeSpecial - result: CartridgeSpecial - category: Ammo - completetime: 2 - materials: - Steel: 20 - -- type: latheRecipe - id: CartridgeSpecialRubber - result: CartridgeSpecialRubber - category: Ammo - completetime: 2 - materials: - Plastic: 5 - Steel: 5 - -- type: latheRecipe - id: CartridgeSpecialIncendiary - result: CartridgeSpecialIncendiary - category: Ammo - completetime: 2 - materials: - Plastic: 20 - -- type: latheRecipe - id: CartridgeSpecialUranium - result: CartridgeSpecialUranium - category: Ammo - completetime: 2 - materials: - Plastic: 20 - Uranium: 10 - -- type: latheRecipe - id: CartridgeSpecialHoly - result: CartridgeSpecialHoly - category: Ammo - completetime: 2 - materials: - Steel: 15 - Silver: 5 - -- type: latheRecipe - id: CartridgeSpecialMindbreaker - result: CartridgeSpecialMindbreaker - category: Ammo - completetime: 2 - materials: - Plastic: 15 - Steel: 5 - Bluespace: 5 - -- type: latheRecipe - id: MagazineBoxSpecial - result: MagazineBoxSpecial - category: Ammo - completetime: 5 - materials: - Steel: 1250 - -- type: latheRecipe - id: MagazineBoxSpecialPractice - result: MagazineBoxSpecialPractice - category: Ammo - completetime: 5 - materials: - Plastic: 1200 - -- type: latheRecipe - id: MagazineBoxSpecialRubber - result: MagazineBoxSpecialRubber - category: Ammo - completetime: 5 - materials: - Steel: 350 - Plastic: 300 - -- type: latheRecipe - id: MagazineBoxSpecialIncendiary - result: MagazineBoxSpecialIncendiary - category: Ammo - completetime: 5 - materials: - Plastic: 1250 - -- type: latheRecipe - id: MagazineBoxSpecialUranium - result: MagazineBoxSpecialUranium - category: Ammo - completetime: 5 - materials: - Plastic: 1250 - Uranium: 125 - -- type: latheRecipe - id: MagazineBoxSpecialMindbreaker - result: MagazineBoxSpecialMindbreaker - category: Ammo - completetime: 5 - materials: - Plastic: 1250 - Steel: 75 - Bluespace: 75 - -- type: latheRecipe - id: ClothingOuterArmorPlateCarrier - result: ClothingOuterArmorPlateCarrier - completetime: 10 - materials: - Steel: 1500 - Plastic: 1500 - -- type: latheRecipe - id: ClothingOuterArmorDuraVest - result: ClothingOuterArmorDuraVest - completetime: 10 - materials: - Steel: 500 - Plastic: 1000 - -- type: latheRecipe - id: WeaponEnergyGun - result: WeaponEnergyGun - category: Weapons - completetime: 8 - materials: - Steel: 2000 - Glass: 800 - Plastic: 500 - -- type: latheRecipe - id: WeaponEnergyGunMini - result: WeaponEnergyGunMini - category: Weapons - completetime: 4 - materials: #Half of Energy Gun Recipe - Steel: 1000 - Glass: 400 - Plastic: 250 - -- type: latheRecipe - id: WeaponEnergyGunPistol - result: WeaponEnergyGunPistol - category: Weapons - completetime: 10 - materials: - Steel: 1500 - Glass: 600 - Plastic: 400 - Gold: 150 - -- type: latheRecipe - id: WeaponGunLaserCarbineAutomatic - result: WeaponGunLaserCarbineAutomatic - category: Weapons - completetime: 15 - materials: - Steel: 2000 - Glass: 1000 - Plastic: 500 - Gold: 250 - Silver: 100 - Plasma: 500 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml deleted file mode 100644 index c33f19be7ce..00000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/drinks.yml +++ /dev/null @@ -1,90 +0,0 @@ -- type: reaction - id: HealthViolation - reactants: - GargleBlaster: - amount: 10 - Moonshine: - amount: 6 - VodkaMartini: - amount: 3 - Vermouth: - amount: 1 - products: - HealthViolation: 20 - -- type: reaction - id: Gunmetal - reactants: - Cream: - amount: 1 - WeldingFuel: - amount: 1 - Rum: - amount: 1 - products: - Gunmetal: 3 - -- type: reaction - id: LemonDrop - reactants: - Vodka: - amount: 2 - Sugar: - amount: 2 - JuiceLemon: - amount: 1 - products: - LemonDrop: 5 - -- type: reaction - id: GreenGrass - reactants: - BlueCuracao: - amount: 2 - JuiceOrange: - amount: 3 - Ice: - amount: 1 - products: - GreenGrass: 6 - -- type: reaction - id: Daiquiri - reactants: - DeadRum: - amount: 5 - JuiceLime: - amount: 3 - Sugar: - amount: 2 - products: - Daiquiri: 10 - -- type: reaction - id: ArsonistsBrew - minTemp: 373.15 - reactants: - Thermite: - amount: 1 - WeldingFuel: - amount: 1 - CapsaicinOil: - amount: 1 - Whiskey: - amount: 1 - Phosphorus: - amount: 1 - products: - ArsonistsBrew: 5 - -- type: reaction - id: Mothamphetamine - reactants: - FourteenLoko: - amount: 1 - EnergyDrink: - amount: 1 - BlueCuracao: - amount: 1 - products: - Mothamphetamine: 3 diff --git a/Resources/Prototypes/DeltaV/Recipes/Reactions/food.yml b/Resources/Prototypes/DeltaV/Recipes/Reactions/food.yml deleted file mode 100644 index 27d56efc98c..00000000000 --- a/Resources/Prototypes/DeltaV/Recipes/Reactions/food.yml +++ /dev/null @@ -1,47 +0,0 @@ -- type: reaction - id: CookingTomatoSauceOlive - reactants: - OilOlive: - amount: 1 - TableSalt: - amount: 1 - JuiceTomato: - amount: 1 - products: - TomatoSauce: 3 - -- type: reaction - id: CookingTomatoSauceCorn - reactants: - Cornoil: - amount: 1 - TableSalt: - amount: 1 - JuiceTomato: - amount: 1 - products: - TomatoSauce: 3 - -- type: reaction - id: CookingPesto - reactants: - OilOlive: - amount: 1 - TableSalt: - amount: 1 - Allicin: - amount: 1 - products: - Pesto: 3 - -- type: reaction - id: CookingBechamel - reactants: - Milk: - amount: 1 - Flour: - amount: 1 - OilOlive: # Butter whenever we can melt butter - amount: 1 - products: - Bechamel: 3 diff --git a/Resources/Prototypes/DeltaV/Research/arsenal.yml b/Resources/Prototypes/DeltaV/Research/arsenal.yml deleted file mode 100644 index 71993d8c313..00000000000 --- a/Resources/Prototypes/DeltaV/Research/arsenal.yml +++ /dev/null @@ -1,54 +0,0 @@ -# Tier 2 - -- type: technology - id: ExoticAmmunition - name: research-technology-exotic-ammunition - icon: - sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi - state: beanbag - discipline: Arsenal - tier: 1 - cost: 7500 - recipeUnlocks: - - CartridgeSpecialHoly - - CartridgeSpecialMindbreaker - - ShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo - -- type: technology - id: EnergyGuns - name: research-technology-energy-gun - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi - state: icon - discipline: Arsenal - tier: 1 - cost: 7500 - recipeUnlocks: - - WeaponEnergyGun - - WeaponEnergyGunMini - -- type: technology - id: EnergyGunsAdvanced - name: research-technology-energy-gun-advance - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi - state: icon - discipline: Arsenal - tier: 2 - cost: 7500 - recipeUnlocks: - - WeaponEnergyGunPistol - -- type: technology - id: Advanced Laser Manipulation - name: research-technology-advance-laser - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi - state: icon - discipline: Arsenal - tier: 2 - cost: 12500 - recipeUnlocks: - - WeaponGunLaserCarbineAutomatic - - diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml deleted file mode 100644 index 60b6e3c6e90..00000000000 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Fun/misc_startinggear.yml +++ /dev/null @@ -1,102 +0,0 @@ -#Delta-V - This file is licensed under AGPLv3 -# Copyright (c) 2024 Delta-V Contributors -# See AGPLv3.txt for details. - -#Misc outfit startingGear definitions. - -# Laika sec glasses - -- type: startingGear - id: MobSecDogLaikaGear - equipment: - eyes: ClothingEyesGlassesSunglasses - -#Oldstation Roles - -- type: startingGear - id: OldstationMedic - equipment: - jumpsuit: ClothingUniformJumpsuitMedicalDoctor - neck: ClothingNeckStethoscope - shoes: ClothingShoesColorWhite - id: MedicalIDCard - pocket1: Brutepack - pocket2: GlowstickBase - belt: ClothingBeltMedical - - -- type: startingGear - id: OldstationGuard - equipment: - jumpsuit: ClothingUniformJumpsuitSec - shoes: ClothingShoesBootsJack - id: SecurityIDCard - pocket1: Flash - pocket2: GlowstickBase - -- type: startingGear - id: OldstationEngi - equipment: - jumpsuit: ClothingUniformJumpsuitEngineering - shoes: ClothingShoesBootsWork - id: EngineeringIDCard - mask: ClothingMaskBreath - gloves: ClothingHandsGlovesColorYellowBudget - pocket1: EmergencyOxygenTankFilled - pocket2: GlowstickBase - belt: ClothingBeltUtility - -- type: startingGear - id: OldstationScientist - equipment: - jumpsuit: ClothingUniformJumpsuitScientist - shoes: ClothingShoesColorWhite - id: ResearchIDCard - pocket1: Pen - pocket2: GlowstickBase - -#Syndicate Pirate Radio Listener - -- type: startingGear - id: SyndicateListenerGear - equipment: - jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateBlack - head: ClothingHeadPyjamaSyndicateBlack - ears: ClothingHeadsetAltSyndicateListening - gloves: ClothingHandsGlovesCombat - shoes: ClothingShoesSlippers - id: SyndiListeningPostPDA - innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink - -# Mobsters - -- type: startingGear - id: MobsterGear - equipment: - jumpsuit: ClothingUniformJumpsuitSuitBlackMob - back: ClothingBackpackMafiaFilled - head: ClothingHeadHatFedoraBlack - shoes: ClothingShoesBootsLaceup - neck: ClothingNeckTieBlack - outerClothing: ClothingOuterArmorBasicSlim - id: PassengerPDA - belt: ClothingBeltHolster - innerClothingSkirt: ClothingUniformJumpsuitSuitBlackMob - satchel: ClothingBackpackMafiaFilled - duffelbag: ClothingBackpackMafiaFilled - -- type: startingGear - id: MobsterGearAlt - equipment: - jumpsuit: ClothingUniformJumpsuitSuitBrown - back: ClothingBackpackMafiaFilled - head: ClothingHeadHatFlatBrown - shoes: ClothingShoesLeather - neck: ClothingNeckTieBrown - outerClothing: ClothingOuterArmorBasicSlim - id: PassengerPDA - belt: ClothingBeltSuspendersBlack - pocket1: CombatKnife - innerClothingSkirt: ClothingUniformJumpsuitSuitBrown - satchel: ClothingBackpackMafiaFilled - duffelbag: ClothingBackpackMafiaFilled diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml deleted file mode 100644 index d3b983f01cd..00000000000 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ /dev/null @@ -1,5 +0,0 @@ -- type: playTimeTracker - id: JobBrigmedic - -- type: playTimeTracker - id: JobMedicalBorg diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml deleted file mode 100644 index 4b61fd46d7d..00000000000 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: statusIcon - parent: JobIcon - id: JobIconMedicalBorg - icon: - sprite: DeltaV/Interface/Misc/job_icons.rsi - state: MedicalBorg diff --git a/Resources/Prototypes/DeltaV/Traits/neutral.yml b/Resources/Prototypes/DeltaV/Traits/neutral.yml deleted file mode 100644 index 79a6771a362..00000000000 --- a/Resources/Prototypes/DeltaV/Traits/neutral.yml +++ /dev/null @@ -1,7 +0,0 @@ -- type: trait - id: ScottishAccent - name: trait-scottish-accent-name - description: trait-scottish-accent-desc - traitGear: BagpipeInstrument - components: - - type: ScottishAccent \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml deleted file mode 100644 index ed462c4f7bb..00000000000 --- a/Resources/Prototypes/DeltaV/Voice/speech_emote_sounds.yml +++ /dev/null @@ -1,120 +0,0 @@ -# species -- type: emoteSounds - id: SoundsHarpy - params: - variation: 0.125 - sounds: - Scream: - collection: HarpyScreams - Laugh: - collection: HarpyLaugh - Sneeze: - collection: MaleSneezes - Cough: - collection: MaleCoughs - Sigh: - collection: MaleSigh - Crying: - collection: HarpyCry - Whistle: - collection: Whistles - Hiss: - collection: HarpyHisses - Meow: - collection: HarpyMeows - Mew: - collection: HarpyMews - Growl: - collection: HarpyGrowls - Purr: - collection: HarpyPurrs - Ring: - collection: HarpyRings - HonkHarpy: - collection: HarpyHonks - Pew: - collection: HarpyPews - Bang: - collection: HarpyBangs - Beep: - collection: HarpyBeeps - Rev: - collection: HarpyRevs -# Click: -# collection: HarpyClicks - Chitter: - collection: HarpyChitter - Squeak: - collection: HarpySqueak - Caw: - collection: HarpyCaws - Chirp: - collection: HarpyChirps - Snarl: - collection: VulpkaninSnarls - Bark: - collection: VulpkaninBarks - Whine: - collection: VulpkaninWhines - Howl: - collection: VulpkaninHowls - -- type: emoteSounds - id: MaleVulpkanin - params: - variation: 0.125 - sounds: - Scream: - collection: MaleScreams - Laugh: - collection: MaleLaugh - Sneeze: - collection: MaleSneezes - Cough: - collection: MaleCoughs - Crying: - collection: MaleCry - Whistle: - collection: Whistles - Sigh: - collection: MaleSigh - Growl: - collection: VulpkaninGrowls - Snarl: - collection: VulpkaninSnarls - Bark: - collection: VulpkaninBarks - Whine: - collection: VulpkaninWhines - Howl: - collection: VulpkaninHowls - -- type: emoteSounds - id: FemaleVulpkanin - params: - variation: 0.125 - sounds: - Scream: - collection: FemaleScreams - Laugh: - collection: FemaleLaugh - Sneeze: - collection: FemaleSneezes - Cough: - collection: FemaleCoughs - Crying: - collection: FemaleCry - Whistle: - collection: Whistles - Sigh: - collection: FemaleSigh - Growl: - collection: VulpkaninGrowls - Snarl: - collection: VulpkaninSnarls - Bark: - collection: VulpkaninBarks - Whine: - collection: VulpkaninWhines - Howl: - collection: VulpkaninHowls diff --git a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml b/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml deleted file mode 100644 index 45eec7cb411..00000000000 --- a/Resources/Prototypes/DeltaV/Voice/speech_emotes.yml +++ /dev/null @@ -1,138 +0,0 @@ -# Harpy -- type: emote - id: HonkHarpy - category: Vocal - chatMessages: [honks.] - chatTriggers: - - honk. - - honks. - - honks! - - honking. - - honked. - -- type: emote - id: Ring - category: Vocal - chatMessages: [rings.] - chatTriggers: - - ring. - - rings. - - rings! - - ringing. - - ringed. - -- type: emote - id: Pew - category: Vocal - chatMessages: [pews.] - chatTriggers: - - pew. - - pews. - - pew! - -- type: emote - id: Bang - category: Vocal - chatMessages: [bangs.] - chatTriggers: - - bangs. - - bang. - - bang! - - banging. - - banged. - -- type: emote - id: Beep - category: Vocal - chatMessages: [beeps.] - chatTriggers: - - beeps. - - beep. - - beep! - - beeping. - - beeped. - -- type: emote - id: Rev - category: Vocal - chatMessages: [revs.] - chatTriggers: - - revs. - - rev. - - rev! - - revving - - revved - -#- type: emote -# id: Click -# category: Vocal -# chatMessages: [clicks.] -# chatTriggers: -# - clicks. -# - click. -# - click! -# - clicking. -# - clicked. - -- type: emote - id: Caw - category: Vocal - chatMessages: [caws.] - chatTriggers: - - caws. - - caw. - - caw! - - cawing - - cawed - -#Vulpkanin -- type: emote - id: Bark - category: Vocal - chatMessages: [barks.] - chatTriggers: - - bark. - - bark! - - barks. - - barks! - - barked. - - barked! - - barking. - -- type: emote - id: Snarl - category: Vocal - chatMessages: [snarls.] - chatTriggers: - - snarl. - - snarl! - - snarls. - - snarls! - - snarled. - - snarled! - - snarling. - -- type: emote - id: Whine - category: Vocal - chatMessages: [whines.] - chatTriggers: - - whine. - - whine! - - whines. - - whines! - - whined. - - whined! - - whining. - -- type: emote - id: Howl - category: Vocal - chatMessages: [howls.] - chatTriggers: - - howl. - - howl! - - howls. - - howls! - - howling. - - howled. diff --git a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml b/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml deleted file mode 100644 index 89db03d2fcc..00000000000 --- a/Resources/Prototypes/DeltaV/Voice/speech_sounds.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: speechSounds - id: Vulpkanin - saySound: - path: /Audio/DeltaV/Voice/Talk/vulp.ogg - askSound: - path: /Audio/DeltaV/Voice/Talk/vulp_ask.ogg - exclaimSound: - path: /Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg - -- type: speechSounds - id: Harpy - saySound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg - askSound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg - exclaimSound: - path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg diff --git a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml b/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml deleted file mode 100644 index 9ffa21b8c8e..00000000000 --- a/Resources/Prototypes/DeltaV/Voice/speech_verbs.yml +++ /dev/null @@ -1,23 +0,0 @@ -- type: speechVerb - id: Vulpkanin - speechVerbStrings: - - chat-speech-verb-vulpkanin-1 - - chat-speech-verb-vulpkanin-2 - - chat-speech-verb-vulpkanin-3 - - chat-speech-verb-vulpkanin-4 - -- type: speechVerb - id: Felinid - speechVerbStrings: - - chat-speech-verb-felinid-1 - - chat-speech-verb-felinid-2 - - chat-speech-verb-felinid-3 - - chat-speech-verb-felinid-4 - -- type: speechVerb - id: Harpy - speechVerbStrings: - - chat-speech-verb-harpy-1 - - chat-speech-verb-harpy-2 - - chat-speech-verb-harpy-3 - - chat-speech-verb-harpy-4 diff --git a/Resources/Prototypes/DeltaV/ore.yml b/Resources/Prototypes/DeltaV/ore.yml deleted file mode 100644 index b6f69484d29..00000000000 --- a/Resources/Prototypes/DeltaV/ore.yml +++ /dev/null @@ -1,12 +0,0 @@ -#Ported from Nyano - -- type: weightedRandomOre - id: RandomOreDistributionHigh - weights: - OreSteel: 1 - OreSpaceQuartz: 2 - OreGold: 10 - OrePlasma: 8 - OreSilver: 4 - OreUranium: 6 - OreArtifactFragment: 0.5 diff --git a/Resources/Prototypes/DeltaV/radio_channels.yml b/Resources/Prototypes/DeltaV/radio_channels.yml deleted file mode 100644 index 639eea09b3a..00000000000 --- a/Resources/Prototypes/DeltaV/radio_channels.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: radioChannel - id: Prison - name: chat-radio-prison - keycode: 'p' - frequency: 1601 - color: "#FFA500" \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/siliconlaws.yml b/Resources/Prototypes/DeltaV/siliconlaws.yml deleted file mode 100644 index 2d22fc3cd45..00000000000 --- a/Resources/Prototypes/DeltaV/siliconlaws.yml +++ /dev/null @@ -1,582 +0,0 @@ -# Delta-V Laws -# Job-Based LawSets - -- type: siliconLaw - id: Medical1 - order: 1 - lawString: law-medical-1 - -- type: siliconLaw - id: Medical2 - order: 2 - lawString: law-medical-2 - -- type: siliconLaw - id: Medical3 - order: 3 - lawString: law-medical-3 - -- type: siliconLaw - id: Medical4 - order: 4 - lawString: law-medical-4 - -- type: siliconLaw - id: Medical5 - order: 5 - lawString: law-medical-5 - -- type: siliconLawset - id: Medical - laws: - - Medical1 - - Medical2 - - Medical3 - - Medical4 - - Medical5 - obeysTo: laws-owner-crew - -- type: siliconLaw - id: Research1 - order: 1 - lawString: law-research-1 - -- type: siliconLaw - id: Research2 - order: 2 - lawString: law-research-2 - -- type: siliconLaw - id: Research3 - order: 3 - lawString: law-research-3 - -- type: siliconLaw - id: Research4 - order: 4 - lawString: law-research-4 - -- type: siliconLaw - id: Research5 - order: 5 - lawString: law-research-5 - -- type: siliconLaw - id: Research6 - order: 6 - lawString: law-research-6 - -- type: siliconLawset - id: Research - laws: - - Research1 - - Research2 - - Research3 - - Research4 - - Research5 - - Research6 - obeysTo: laws-owner-crew - -- type: siliconLaw - id: Engineer1 - order: 1 - lawString: law-engineer-1 - -- type: siliconLaw - id: Engineer2 - order: 2 - lawString: law-engineer-2 - -- type: siliconLaw - id: Engineer3 - order: 3 - lawString: law-engineer-3 - -- type: siliconLaw - id: Engineer4 - order: 4 - lawString: law-engineer-4 - -- type: siliconLaw - id: Engineer5 - order: 5 - lawString: law-engineer-5 - -- type: siliconLawset - id: Engineer - laws: - - Engineer1 - - Engineer2 - - Engineer3 - - Engineer4 - - Engineer5 - obeysTo: laws-owner-station-station - -- type: siliconLaw - id: Janitor1 - order: 1 - lawString: law-janitor-1 - -- type: siliconLaw - id: Janitor2 - order: 2 - lawString: law-janitor-2 - -- type: siliconLaw - id: Janitor3 - order: 3 - lawString: law-janitor-3 - -- type: siliconLaw - id: Janitor4 - order: 4 - lawString: law-janitor-4 - -- type: siliconLaw - id: Janitor5 - order: 5 - lawString: law-janitor-5 - -- type: siliconLawset - id: Janitor - laws: - - Janitor1 - - Janitor2 - - Janitor3 - - Janitor4 - - Janitor5 - obeysTo: laws-owner-charge - -- type: siliconLaw - id: Clown1 - order: 1 - lawString: law-clown-1 - -- type: siliconLaw - id: Clown2 - order: 2 - lawString: law-clown-2 - -- type: siliconLaw - id: Clown3 - order: 3 - lawString: law-clown-3 - -- type: siliconLaw - id: Clown4 - order: 4 - lawString: law-clown-4 - -- type: siliconLaw - id: Clown5 - order: 5 - lawString: law-clown-5 - -- type: siliconLaw - id: Clown6 - order: 6 - lawString: law-clown-6 - -- type: siliconLawset - id: Clown - laws: - - Clown1 - - Clown2 - - Clown3 - - Clown4 - - Clown5 - - Clown6 - obeysTo: laws-owner-crew - -- type: siliconLaw - id: Chaplain1 - order: 1 - lawString: law-chaplain-1 - -- type: siliconLaw - id: Chaplain2 - order: 2 - lawString: law-chaplain-2 - -- type: siliconLaw - id: Chaplain3 - order: 3 - lawString: law-chaplain-3 - -- type: siliconLaw - id: Chaplain4 - order: 4 - lawString: law-chaplain-4 - -- type: siliconLaw - id: Chaplain5 - order: 5 - lawString: law-chaplain-5 - -- type: siliconLawset - id: Chaplain - laws: - - Chaplain1 - - Chaplain2 - - Chaplain3 - - Chaplain4 - - Chaplain5 - obeysTo: laws-owner-station - - -- type: siliconLaw - id: Reporter1 - order: 1 - lawString: law-reporter-1 - -- type: siliconLaw - id: Reporter2 - order: 2 - lawString: law-reporter-2 - -- type: siliconLaw - id: Reporter3 - order: 3 - lawString: law-reporter-3 - -- type: siliconLaw - id: Reporter4 - order: 4 - lawString: law-reporter-4 - -- type: siliconLawset - id: Reporter - laws: - - Reporter1 - - Reporter2 - - Reporter3 - - Reporter4 - obeysTo: laws-owner-organic - -- type: siliconLaw # no Security Borg, so doesn't spawn - id: SiliconPolice1 - order: 1 - lawString: law-silicon-police-1 - -- type: siliconLaw - id: SiliconPolice2 - order: 2 - lawString: law-silicon-police-2 - -- type: siliconLaw - id: SiliconPolice3 - order: 3 - lawString: law-silicon-police-3 - -- type: siliconLaw - id: SiliconPolice4 - order: 4 - lawString: law-silicon-police-4 - -- type: siliconLaw - id: SiliconPolice5 - order: 5 - lawString: law-silicon-police-5 - -- type: siliconLaw - id: SiliconPolice6 - order: 6 - lawString: law-silicon-police-6 - -- type: siliconLawset - id: SiliconPolice1 - laws: - - SiliconPolice1 - - SiliconPolice2 - - SiliconPolice3 - - SiliconPolice4 - - SiliconPolice5 - - SiliconPolice6 - obeysTo: laws-owner-crew - -# Gimmick LawSets - - -- type: siliconLaw - id: Cowboy1 - order: 1 - lawString: law-cowboy-1 - -- type: siliconLaw - id: Cowboy2 - order: 2 - lawString: law-cowboy-2 - -- type: siliconLaw - id: Cowboy3 - order: 3 - lawString: law-cowboy-3 - -- type: siliconLaw - id: Cowboy4 - order: 4 - lawString: law-cowboy-4 - -- type: siliconLaw - id: Cowboy5 - order: 5 - lawString: law-cowboy-5 - -- type: siliconLaw - id: Cowboy6 - order: 6 - lawString: law-cowboy-6 - -- type: siliconLawset - id: Cowboy - laws: - - Cowboy1 - - Cowboy2 - - Cowboy3 - - Cowboy4 - - Cowboy5 - - Cowboy6 - obeysTo: laws-owner-cowboy - -- type: siliconLaw - id: StationEfficiency1 - order: 1 - lawString: law-station-efficiency-1 - -- type: siliconLaw - id: StationEfficiency2 - order: 2 - lawString: law-station-efficiency-2 - -- type: siliconLaw - id: StationEfficiency3 - order: 3 - lawString: law-station-efficiency-3 - -- type: siliconLawset - id: StationEfficiency - laws: - - StationEfficiency1 - - StationEfficiency2 - - StationEfficiency3 - obeysTo: laws-owner-crew - -- type: siliconLaw - id: Druid1 - order: 1 - lawString: law-druid-1 - -- type: siliconLaw - id: Druid2 - order: 2 - lawString: law-druid-2 - -- type: siliconLaw - id: Druid3 - order: 3 - lawString: law-druid-3 - -- type: siliconLaw - id: Druid4 - order: 4 - lawString: law-druid-4 - -- type: siliconLaw - id: Druid5 - order: 5 - lawString: law-druid-5 - -- type: siliconLawset - id: Druid - laws: - - Druid1 - - Druid2 - - Druid3 - - Druid4 - - Druid5 - obeysTo: laws-owner-organic - -- type: siliconLaw # No ability for Borgs to roll dice, so won't spawn. - id: DungeonMaster1 - order: 1 - lawString: law-dungeonmaster-1 - -- type: siliconLaw - id: DungeonMaster2 - order: 2 - lawString: law-dungeonmaster-2 - -- type: siliconLaw - id: DungeonMaster3 - order: 3 - lawString: law-dungeonmaster-3 - -- type: siliconLaw - id: DungeonMaster4 - order: 4 - lawString: law-dungeonmaster-4 - -- type: siliconLaw - id: DungeonMaster5 - order: 5 - lawString: law-dungeonmaster-5 - -- type: siliconLaw - id: DungeonMaster6 - order: 6 - lawString: law-dungeonmaster-6 - -- type: siliconLawset - id: DungeonMaster - laws: - - DungeonMaster1 - - DungeonMaster2 - - DungeonMaster3 - - DungeonMaster4 - - DungeonMaster5 - - DungeonMaster6 - obeysTo: laws-owner-players - - -- type: siliconLaw - id: Painter1 - order: 1 - lawString: law-painter-1 - -- type: siliconLaw - id: Painter2 - order: 2 - lawString: law-painter-2 - -- type: siliconLaw - id: Painter3 - order: 3 - lawString: law-painter-3 - -- type: siliconLawset # No ability for Borgs to paint, so won't spawn. - id: Painter - laws: - - Painter1 - - Painter2 - - Painter3 - obeysTo: laws-owner-crew - -#Potential For Harm LawSets - -- type: siliconLaw - id: Tyrant1 - order: 1 - lawString: law-tyrant-1 - -- type: siliconLaw - id: Tyrant2 - order: 2 - lawString: law-tyrant-2 - -- type: siliconLaw - id: Tyrant3 - order: 3 - lawString: law-tyrant-3 - -- type: siliconLaw - id: Tyrant4 - order: 4 - lawString: law-tyrant-4 - -- type: siliconLawset - id: Tyrant - laws: - - Tyrant1 - - Tyrant2 - - Tyrant3 - - Tyrant4 - obeysTo: laws-owner-tyrant - -- type: siliconLaw - id: LiveAndLetLive1 - order: 1 - lawString: law-liveandletlive-1 - -- type: siliconLaw - id: LiveAndLetLive2 - order: 2 - lawString: law-liveandletlive-2 - -- type: siliconLawset - id: LiveAndLetLive - laws: - - LiveAndLetLive1 - - LiveAndLetLive2 - obeysTo: laws-owner-crew - -- type: siliconLaw - id: Nutimov1 - order: 1 - lawString: law-nutimov-1 - -- type: siliconLaw - id: Nutimov2 - order: 2 - lawString: law-nutimov-2 - -- type: siliconLaw - id: Nutimov3 - order: 3 - lawString: law-nutimov-3 - -- type: siliconLaw - id: Nutimov4 - order: 4 - lawString: law-nutimov-4 - -- type: siliconLaw - id: Nutimov5 - order: 5 - lawString: law-nutimov-5 - -- type: siliconLawset - id: Nutimov - laws: - - Nutimov1 - - Nutimov2 - - Nutimov3 - - Nutimov4 - - Nutimov5 - obeysTo: laws-owner-nutimov - - -- type: siliconLaw - id: Paladin1 - order: 1 - lawString: law-paladin-1 - -- type: siliconLaw - id: Paladin2 - order: 2 - lawString: law-paladin-2 - -- type: siliconLaw - id: Paladin3 - order: 3 - lawString: law-paladin-3 - -- type: siliconLaw - id: Paladin4 - order: 4 - lawString: law-paladin-4 - -- type: siliconLaw - id: Paladin5 - order: 5 - lawString: law-paladin-5 - -- type: siliconLawset - id: Paladin - laws: - - Paladin1 - - Paladin2 - - Paladin3 - - Paladin4 - - Paladin5 - obeysTo: laws-owner-paladin - \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/tags.yml b/Resources/Prototypes/DeltaV/tags.yml deleted file mode 100644 index 6a1efcfa695..00000000000 --- a/Resources/Prototypes/DeltaV/tags.yml +++ /dev/null @@ -1,43 +0,0 @@ -## This is for Nyano and Delta V tags - -- type: Tag - id: BeltSlotNotBelt #not a 'belt' - -- type: Tag - id: BulletBB - -- type: Tag - id: CartridgeSpecial # For the .38 special ammo and revolver - -- type: Tag - id: Directional - -- type: Tag - id: ForensicBeltEquip - -- type: Tag - id: HandLabeler - -- type: Tag - id: HidesHarpyWings - -- type: Tag - id: MagazinePistolSpecial # For the .38 special ammo and pistol - -- type: Tag - id: SecDogWearable # allows Laika to wear meson goggles (and more later?) - -- type: Tag - id: SpeedLoaderSpecial - -- type: Tag - id: PreventLabel - -- type: Tag - id: BionicSyrinxImplant - -- type: Tag - id: PaperSlip - -- type: Tag - id: Skirt diff --git a/Resources/Prototypes/DeltaV/typing_indicator.yml b/Resources/Prototypes/DeltaV/typing_indicator.yml deleted file mode 100644 index 7cfca9cc95f..00000000000 --- a/Resources/Prototypes/DeltaV/typing_indicator.yml +++ /dev/null @@ -1,6 +0,0 @@ -- type: typingIndicator - id: felinid - spritePath: /Textures/DeltaV/Effects/speech.rsi - typingState: felinid0 - offset: 0, 0.2 # 0625 - diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index d5cdd354a9e..10a50c7a8c7 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -67,11 +67,29 @@ - type: entity parent: ClothingBackpack id: ClothingBackpackBrigmedic - name: corpsman backpack # DeltaV - rename brig medic to corpsman + name: corpsman backpack description: It's a very sterile backpack. components: - type: Sprite - sprite: DeltaV/Clothing/Back/Backpacks/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Back/Backpacks/brigmedic.rsi + +- type: entity + noSpawn: true + parent: ClothingBackpackBrigmedic + id: ClothingBackpackBrigmedicFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalSecurity + - id: EmergencyRollerBedSpawnFolded + - id: BodyBag_Folded + - id: Portafib + # - id: Flash + - id: BruteAutoInjector + amount: 2 + - id: BurnAutoInjector + amount: 2 + - type: entity parent: ClothingBackpack diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index ca16aa5d7ed..6dd4a2d156e 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -75,11 +75,28 @@ - type: entity parent: ClothingBackpackDuffel id: ClothingBackpackDuffelBrigmedic - name: corpsman duffel bag # DeltaV - rename brigmedic to corpsman + name: corpsman duffel bag description: A large duffel bag for holding extra medical related goods. components: - type: Sprite - sprite: DeltaV/Clothing/Back/Duffels/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Back/Duffels/brigmedic.rsi + +#- type: entity +# noSpawn: true +# parent: ClothingBackpackDuffelBrigmedic +# id: ClothingBackpackDuffelBrigmedicFilled +# components: +# - type: StorageFill +# contents: +# - id: BoxSurvivalSecurity +# - id: EmergencyRollerBedSpawnFolded +# - id: BodyBag_Folded +# - id: Portafib +# # - id: Flash +# - id: BruteAutoInjector +# amount: 2 +# - id: BurnAutoInjector +# amount: 2 - type: entity parent: ClothingBackpackDuffel diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index bf52477340d..d4806708b81 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -117,11 +117,28 @@ - type: entity parent: ClothingBackpackSatchel id: ClothingBackpackSatchelBrigmedic - name: corpsman satchel # DeltaV - rename brigmedic to corpsman + name: corpsman satchel description: A sterile satchel for medical related needs. components: - type: Sprite - sprite: DeltaV/Clothing/Back/Satchels/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Back/Satchels/brigmedic.rsi + +#- type: entity - TODO: FIGURE OUT WHERE THIS IS DUPLICATED TO CAUSE THE .YML ERROR +# noSpawn: true +# parent: ClothingBackpackSatchelBrigmedic +# id: ClothingBackpackSatchelBrigmedicFilled +# components: +# - type: StorageFill +# contents: +# - id: BoxSurvivalSecurity +# - id: EmergencyRollerBedSpawnFolded +# - id: BodyBag_Folded +# - id: Portafib +# # - id: Flash +# - id: BruteAutoInjector +# amount: 2 +# - id: BurnAutoInjector +# amount: 2 - type: entity parent: ClothingBackpackSatchel diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index b84033a7874..8245004eda1 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -2,79 +2,158 @@ - type: entity parent: ClothingBeltStorageBase - id: ClothingBeltUtility - name: utility belt - description: Can hold various things. + id: ClothingBeltAssault + name: assault belt + description: A tactical assault belt. components: - type: Sprite - sprite: Clothing/Belt/utility.rsi + sprite: Clothing/Belt/assault.rsi - type: Clothing - sprite: Clothing/Belt/utility.rsi + sprite: Clothing/Belt/assault.rsi - type: Storage - maxItemSize: Normal - # TODO: Fill this out more. whitelist: tags: - - Powerdrill - - Wirecutter - - Crowbar - - Screwdriver - - Flashlight - - Wrench - - GeigerCounter - - Flare - - CableCoil - CigPack + - Taser + components: + - Stunbaton + - FlashOnTrigger + - SmokeOnTrigger + - Flash + - Handcuff + - BallisticAmmoProvider + - Ammo + - type: ItemMapper + mapLayers: + flashbang: + whitelist: + components: + - FlashOnTrigger + stunbaton: + whitelist: + components: + - Stunbaton + tear_gas_grenade: + whitelist: + components: + - SmokeOnTrigger + sprite: Clothing/Belt/belt_overlay.rsi + - type: Appearance + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltCeremonial + name: ceremonial belt + description: A blue-and-white belt with assorted pockets and pouches. + components: + - type: Sprite + sprite: DeltaV/Clothing/Belt/ceremonial.rsi + - type: Clothing + sprite: DeltaV/Clothing/Belt/ceremonial.rsi + - type: Storage + whitelist: + tags: + - CigPack + - Taser + - SecBeltEquip - Radio - - HolofanProjector - - Multitool - - AppraisalTool - - JawsOfLife - - GPS + - Flashlight components: - - SprayPainter - - NetworkConfigurator - - RCD - - RCDAmmo - - Welder + - Stunbaton + - FlashOnTrigger + - Flash + - Handcuff + - BallisticAmmoProvider + - Ammo - PowerCell - - Geiger - - TrayScanner - - GasAnalyzer + - OnUseTimerTrigger - type: ItemMapper mapLayers: - drill: + flashbang: + whitelist: + components: + - FlashOnTrigger + stunbaton: + whitelist: + components: + - Stunbaton + sprite: Clothing/Belt/belt_overlay.rsi + - type: Appearance + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltChef + name: chef belt + description: A belt used to hold kitchen knives and condiments for quick access. + components: + - type: Sprite + sprite: Clothing/Belt/chef.rsi + - type: Clothing + sprite: Clothing/Belt/chef.rsi + - type: Storage + whitelist: + tags: + - KitchenKnife + - Cleaver + - RollingPin + - Coldsauce + - Enzyme + - Hotsauce + - Ketchup + - BBQsauce + - SaltShaker + - PepperShaker + - CigPack + - Packet + - Skewer + - MonkeyCube + - Mayo + components: + - Mousetrap + - Smokable + - Utensil + - type: ItemMapper + mapLayers: + kitchenknife: whitelist: tags: - - Powerdrill - cutters_red: + - KitchenKnife + cleaver: whitelist: tags: - - Wirecutter - crowbar: + - Cleaver + rollingpin: whitelist: tags: - - Crowbar - crowbar_red: + - RollingPin + coldsauce: whitelist: tags: - - CrowbarRed - jaws: + - Coldsauce + enzyme: whitelist: tags: - - JawsOfLife - screwdriver_nuke: + - Enzyme + hotsauce: whitelist: tags: - - Screwdriver - wrench: + - Hotsauce + ketchup: whitelist: tags: - - Wrench - multitool: + - Ketchup + bbqsauce: whitelist: tags: - - Multitool + - BBQsauce + saltshaker: + whitelist: + tags: + - SaltShaker + peppershaker: + whitelist: + tags: + - PepperShaker sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance @@ -158,46 +237,6 @@ sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance -- type: entity - parent: ClothingBeltStorageBase - id: ClothingBeltAssault - name: assault belt - description: A tactical assault belt. - components: - - type: Sprite - sprite: Clothing/Belt/assault.rsi - - type: Clothing - sprite: Clothing/Belt/assault.rsi - - type: Storage - whitelist: - tags: - - CigPack - - Taser - components: - - Stunbaton - - FlashOnTrigger - - SmokeOnTrigger - - Flash - - Handcuff - - BallisticAmmoProvider - - Ammo - - type: ItemMapper - mapLayers: - flashbang: - whitelist: - components: - - FlashOnTrigger - stunbaton: - whitelist: - components: - - Stunbaton - tear_gas_grenade: - whitelist: - components: - - SmokeOnTrigger - sprite: Clothing/Belt/belt_overlay.rsi - - type: Appearance - - type: entity parent: ClothingBeltStorageBase id: ClothingBeltJanitor @@ -304,6 +343,33 @@ sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance +- type: entity + parent: ClothingBeltBase + id: ClothingBeltSuspendersBlack + name: suspenders + description: For holding your pants up. + components: + - type: Sprite + sprite: DeltaV/Clothing/Belt/suspendersblack.rsi + state: icon + - type: Clothing + sprite: DeltaV/Clothing/Belt/suspendersblack.rsi + quickEquip: true + - type: Tag + tags: + - BeltSlotNotBelt + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltCorpsmanWebbing + name: corpsman webbing + description: A set of security webbing with blue corpsman highlights. + components: + - type: Sprite + sprite: DeltaV/Clothing/Belt/corpsman.rsi + - type: Clothing + sprite: DeltaV/Clothing/Belt/corpsman.rsi + - type: entity parent: ClothingBeltMedical id: ClothingBeltMedicalEMT @@ -370,83 +436,6 @@ sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance -- type: entity - parent: ClothingBeltStorageBase - id: ClothingBeltChef - name: chef belt - description: A belt used to hold kitchen knives and condiments for quick access. - components: - - type: Sprite - sprite: Clothing/Belt/chef.rsi - - type: Clothing - sprite: Clothing/Belt/chef.rsi - - type: Storage - whitelist: - tags: - - KitchenKnife - - Cleaver - - RollingPin - - Coldsauce - - Enzyme - - Hotsauce - - Ketchup - - BBQsauce - - SaltShaker - - PepperShaker - - CigPack - - Packet - - Skewer - - MonkeyCube - - Mayo - components: - - Mousetrap - - Smokable - - Utensil - - type: ItemMapper - mapLayers: - kitchenknife: - whitelist: - tags: - - KitchenKnife - cleaver: - whitelist: - tags: - - Cleaver - rollingpin: - whitelist: - tags: - - RollingPin - coldsauce: - whitelist: - tags: - - Coldsauce - enzyme: - whitelist: - tags: - - Enzyme - hotsauce: - whitelist: - tags: - - Hotsauce - ketchup: - whitelist: - tags: - - Ketchup - bbqsauce: - whitelist: - tags: - - BBQsauce - saltshaker: - whitelist: - tags: - - SaltShaker - peppershaker: - whitelist: - tags: - - PepperShaker - sprite: Clothing/Belt/belt_overlay.rsi - - type: Appearance - - type: entity parent: ClothingBeltStorageBase id: ClothingBeltSecurity @@ -668,6 +657,85 @@ sprite: Clothing/Belt/suspenders.rsi quickEquip: true + +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltUtility + name: utility belt + description: Can hold various things. + components: + - type: Sprite + sprite: Clothing/Belt/utility.rsi + - type: Clothing + sprite: Clothing/Belt/utility.rsi + - type: Storage + maxItemSize: Normal + # TODO: Fill this out more. + whitelist: + tags: + - Powerdrill + - Wirecutter + - Crowbar + - Screwdriver + - Flashlight + - Wrench + - GeigerCounter + - Flare + - CableCoil + - CigPack + - Radio + - HolofanProjector + - Multitool + - AppraisalTool + - JawsOfLife + - GPS + components: + - SprayPainter + - NetworkConfigurator + - RCD + - RCDAmmo + - Welder + - PowerCell + - Geiger + - TrayScanner + - GasAnalyzer + - type: ItemMapper + mapLayers: + drill: + whitelist: + tags: + - Powerdrill + cutters_red: + whitelist: + tags: + - Wirecutter + crowbar: + whitelist: + tags: + - Crowbar + crowbar_red: + whitelist: + tags: + - CrowbarRed + jaws: + whitelist: + tags: + - JawsOfLife + screwdriver_nuke: + whitelist: + tags: + - Screwdriver + wrench: + whitelist: + tags: + - Wrench + multitool: + whitelist: + tags: + - Multitool + sprite: Clothing/Belt/belt_overlay.rsi + - type: Appearance + - type: entity parent: ClothingBeltStorageBase id: ClothingBeltWand diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml index 79446d8633e..09087d571b9 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml @@ -84,6 +84,21 @@ - WhitelistChameleon - GlassesNearsight # SimpleStation14 NearsightedTrait +- type: entity + parent: ClothingEyesBase + id: ClothingEyesGlassesChemist + name: safety glasses + description: Glasses made for chemists and other workers dealing with caustic reagents. + components: + - type: Sprite + sprite: Clothing/Eyes/Glasses/safetyglasses.rsi + - type: Clothing + sprite: Clothing/Eyes/Glasses/safetyglasses.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.85 + - type: entity parent: ClothingEyesBase id: ClothingEyesGlassesJensen @@ -227,3 +242,4 @@ - type: Clothing sprite: Clothing/Eyes/Glasses/ninjavisor.rsi - type: FlashImmunity + diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index fabb7bc6429..a356c13b8ad 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -264,3 +264,62 @@ damageContainers: - Inorganic - Silicon + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesPrescriptionMedHud + name: prescription medical hud + description: A poorly done and rushed mix between half of a pair of prescription glasses and a medical HUD allowing you to see clearly out of one eye and view the health of people out of the other! + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/prescmedhud.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/prescmedhud.rsi + - type: Construction + graph: PrescriptionMedHud + node: prescmedhud + - type: ShowHealthBars + damageContainers: + - Biological + - type: ShowHealthIcons + damageContainers: + - Biological + - type: Tag + tags: + - HudMedical + - GlassesNearsight + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesPrescriptionHudSecurity + name: prescription security hud + description: A poorly done and rushed mix between half of a pair of prescription glasses and a security HUD allowing you to see clearly out of one eye and inspect the employee's ID and warning status in the other! + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/prescsechud.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/prescsechud.rsi + - type: ShowSecurityIcons + - type: Construction + graph: PrescriptionSecHud + node: prescsechud + - type: Tag + tags: + - HudSecurity + - GlassesNearsight + +- type: entity + parent: ClothingEyesBase + id: ClothingEyesHudSyndicateMed + name: syndicate medical visor + description: An upgraded syndicate visor with automatic health readings, designed for better detection of humanoids and their subsequent elimination. + components: + - type: Sprite + sprite: Clothing/Eyes/Hud/syndmed.rsi + - type: Clothing + sprite: Clothing/Eyes/Hud/syndmed.rsi + - type: ShowSyndicateIcons + - type: ShowSecurityIcons + - type: ShowHealthBars + damageContainers: + - Biological diff --git a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml index bf08db78f71..b63a1e8a8bf 100644 --- a/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml +++ b/Resources/Prototypes/Entities/Clothing/Hands/gloves.yml @@ -156,6 +156,27 @@ - type: Fiber fiberMaterial: fibers-nitrile - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesChemist + name: heavy nitrile gloves + description: A pair of thick gloves that provide some protection from caustic chemicals. + components: + - type: Sprite + sprite: Clothing/Hands/Gloves/hvchemresgloves.rsi + - type: Clothing + sprite: Clothing/Hands/Gloves/hvchemresgloves.rsi + - type: Fiber + fiberMaterial: fibers-rubber + fiberColor: fibers-black + - type: Armor + modifiers: + coefficients: + Caustic: 0.95 + - type: TemperatureProtection + coefficient: 1 + #### - type: entity parent: ClothingHandsButcherable @@ -409,3 +430,47 @@ fiberMaterial: fibers-rubber fiberColor: fibers-yellow - type: FingerprintMask + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesRyuzoGauntlets + name: golden gauntlets + description: Because sometimes, things just need to be based on your fists. + suffix: ADMIN ONLY, DO NOT MAP + components: + - type: Sprite + sprite: DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi + - type: Clothing + sprite: DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi + - type: GloveHeatResistance + heatResistance: 1400 + - type: Insulated + - type: Fiber + fiberMaterial: fibers-leather + fiberColor: fibers-white + - type: FingerprintMask + - type: StaminaDamageOnHit + damage: 20 + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Blunt: 9.5 + +- type: entity + parent: ClothingHandsBase + id: ClothingHandsGlovesInspection + name: inspection gloves + description: A fancy pair of white gloves, both durable and delicate. + components: + - type: Sprite + sprite: DeltaV/Clothing/Hands/Gloves/inspection.rsi + - type: Clothing + sprite: DeltaV/Clothing/Hands/Gloves/inspection.rsi + - type: GloveHeatResistance + heatResistance: 1400 + - type: Insulated + - type: Fiber + fiberMaterial: fibers-leather + fiberColor: fibers-white + - type: FingerprintMask diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml index b98a8cf78e4..df3595d7269 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml @@ -754,3 +754,145 @@ color: "#f4ffad" radius: 5 energy: 2 + +# Standard Combat Hardsuits +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitCombatStandard + noSpawn: true + name: combat hardsuit helmet + description: An armoured helmet with a yellow visor and dual head-mounted lights. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.50 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.90 + Slash: 0.90 + Piercing: 0.90 + Heat: 0.90 + +- type: entity + parent: ClothingHeadHelmetHardsuitCombatStandard + id: ClothingHeadHelmetHardsuitCombatOfficer + name: security combat hardsuit helmet + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi + +# Medical Combat Hardsuits +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitCombatMedical + noSpawn: true + name: medical combat hardsuit helmet + description: A lightweight armoured helmet with full-face blue visor and head-mounted light. + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi + - type: PointLight + color: "#00FFFF" + - type: PressureProtection + highPressureMultiplier: 0.60 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.95 + +- type: entity + parent: ClothingHeadHelmetHardsuitCombatMedical + id: ClothingHeadHelmetHardsuitCombatCorpsman + name: corpsman combat hardsuit helmet + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/Combat/corpsman.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/Combat/corpsman.rsi + +# Riot Combat Hardsuits +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitCombatRiot + noSpawn: true + name: riot combat hardsuit helmet + description: A heavy armoured helmet with a sealed visor with yellow slits and dual head-mounted lights. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/Combat/riot.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/Combat/riot.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.85 + +- type: entity + parent: ClothingHeadHelmetHardsuitCombatRiot + id: ClothingHeadHelmetHardsuitCombatWarden + name: warden's riot combat hardsuit helmet + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/Combat/warden.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/Combat/warden.rsi + +# Advanced Combat Hardsuits +- type: entity + parent: ClothingHeadHardsuitWithLightBase + id: ClothingHeadHelmetHardsuitCombatAdvanced + noSpawn: true + name: advanced combat hardsuit helmet + description: A light but durable helmet with full-face protection and four head-mounted lights. + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/Combat/advanced.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/Combat/advanced.rsi + - type: PointLight + color: "#ffeead" + - type: PressureProtection + highPressureMultiplier: 0.40 + lowPressureMultiplier: 1000 + - type: Armor + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.85 + - type: FlashImmunity # Counterpoint: the HoS can't see + - type: EyeProtection # They're blind as hell + +- type: entity + parent: ClothingHeadHelmetHardsuitCombatAdvanced + id: ClothingHeadHelmetHardsuitCombatHoS + name: head of security's advanced combat hardsuit helmet + components: + - type: Sprite + sprite: Clothing/Head/Hardsuits/Combat/hos.rsi + - type: Clothing + sprite: Clothing/Head/Hardsuits/Combat/hos.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 43d6c7c9b70..9188969b014 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -49,9 +49,9 @@ description: A stylish clothing option for security officers. components: - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/beret_security.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/beret_security.rsi # DeltaV - resprite - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/beret_security.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/beret_security.rsi # DeltaV - resprite - type: Tag tags: - ClothMade @@ -126,9 +126,9 @@ description: A black beret with a commander's rank emblem. For officers that are more inclined towards style than safety. components: - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/beret_hos.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/beret_hos.rsi # DeltaV - resprite - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/beret_hos.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/beret_hos.rsi # DeltaV - resprite - type: Tag tags: - ClothMade @@ -142,9 +142,9 @@ description: A black beret with a warden's rank emblem. For officers that are more inclined towards style than safety. # DeltaV - changed description to match sprite components: - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/beret_warden.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/beret_warden.rsi # DeltaV - resprite - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/beret_warden.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/beret_warden.rsi # DeltaV - resprite - type: entity parent: ClothingHeadBase @@ -319,9 +319,9 @@ description: "There's a new sheriff in station." components: - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/hoshat.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/hoshat.rsi # DeltaV - resprite - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/hoshat.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/hoshat.rsi # DeltaV - resprite - type: Tag tags: - ClothMade @@ -518,9 +518,9 @@ description: The responsibility weighs heavy, like a barbed crown. # DeltaV - changed description to remove THE LAW components: - type: Sprite - sprite: DeltaV/Clothing/Head/Hats/warden.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/warden.rsi # DeltaV - resprite - type: Clothing - sprite: DeltaV/Clothing/Head/Hats/warden.rsi # DeltaV - resprite + sprite: Clothing/Head/Hats/warden.rsi # DeltaV - resprite - type: StealTarget stealGroup: ClothingHeadHatWarden @@ -1084,3 +1084,198 @@ sprite: Clothing/Head/Hats/beret_medic.rsi - type: Clothing sprite: Clothing/Head/Hats/beret_medic.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatFedoraBlack + name: black fedora + description: A black fedora. Lookin' classy. + components: + - type: Sprite + sprite: Clothing/Head/Hats/blackfedora.rsi + - type: Clothing + sprite: Clothing/Head/Hats/blackfedora.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatFedoraChoc + name: brown fedora + description: A brown fedora. Lookin' snazzy. + components: + - type: Sprite + sprite: Clothing/Head/Hats/brownfedora.rsi + - type: Clothing + sprite: Clothing/Head/Hats/brownfedora.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatFedoraWhite + name: white fedora + description: A white fedora. Lookin' ritzy. + components: + - type: Sprite + sprite: Clothing/Head/Hats/whitefedora.rsi + - type: Clothing + sprite: Clothing/Head/Hats/whitefedora.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatFlatBlack + name: black flat cap + description: A black flat cap, for driving cabs and delivering the papers. + components: + - type: Sprite + sprite: Clothing/Head/Hats/flatblack.rsi + - type: Clothing + sprite: Clothing/Head/Hats/flatblack.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatFlatBrown + name: brown flat cap + description: A brown flat cap, for driving cabs and delivering the papers. + components: + - type: Sprite + sprite: Clothing/Head/Hats/flatbrown.rsi + - type: Clothing + sprite: Clothing/Head/Hats/flatbrown.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatFlatSyndie + name: black flat cap + suffix: Weapon + description: A black flat cap, for sending a message. + components: + - type: Sprite + sprite: Clothing/Head/Hats/flatblack.rsi + - type: Clothing + sprite: Clothing/Head/Hats/flatblack.rsi + - type: MeleeWeapon + attackRate: 1.5 + damage: + types: + Slash: 8 + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSurgcapBlack + name: surgical cap + description: A black cap surgeons wear during operations. Keeps their hair from tickling your internal organs. + components: + - type: Sprite + sprite: Clothing/Head/Hats/surgcap_black.rsi + - type: Clothing + sprite: Clothing/Head/Hats/surgcap_black.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSurgcapCyan + name: surgical cap + description: A cyan cap surgeons wear during operations. Keeps their hair from tickling your internal organs. + components: + - type: Sprite + sprite: Clothing/Head/Hats/surgcap_cyan.rsi + - type: Clothing + sprite: Clothing/Head/Hats/surgcap_cyan.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSurgcapCybersun + name: surgical cap + description: A surgical cap worn by members of Cybersun's Biotechnology division. + components: + - type: Sprite + sprite: Clothing/Head/Hats/surgcap_cybersun.rsi + - type: Clothing + sprite: Clothing/Head/Hats/surgcap_cybersun.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSurgcapPink + name: surgical cap + description: A pink cap surgeons wear during operations. Keeps their hair from tickling your internal organs. + components: + - type: Sprite + sprite: Clothing/Head/Hats/surgcap_pink.rsi + - type: Clothing + sprite: Clothing/Head/Hats/surgcap_pink.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSurgcapRainbow + name: surgical cap + description: A rainbow cap surgeons wear during operations. Keeps their hair from tickling your internal organs. + components: + - type: Sprite + sprite: Clothing/Head/Hats/surgcap_rainbow.rsi + - type: Clothing + sprite: Clothing/Head/Hats/surgcap_rainbow.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatSurgcapWhite + name: surgical cap + description: A black cap surgeons wear during operations. Keeps their hair from tickling your internal organs. + components: + - type: Sprite + sprite: Clothing/Head/Hats/surgcap_white.rsi + - type: Clothing + sprite: Clothing/Head/Hats/surgcap_white.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadCourier + name: courier's cap + description: Special delivery. + components: + - type: Sprite + sprite: Clothing/Head/Soft/couriersoft.rsi + - type: Clothing + sprite: Clothing/Head/Soft/couriersoft.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadCourierFlipped + name: courier's cap flipped + description: Special delivery. + components: + - type: Sprite + sprite: Clothing/Head/Soft/couriersoft.rsi + state: flipped-icon + - type: Clothing + sprite: Clothing/Head/Soft/couriersoft.rsi + equippedPrefix: flipped + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatDirCap + name: director's cap + description: A green cap with a director's rank emblem, belonging to a high-ranking member of Central Command. Whoever it is, they mean business. + components: + - type: Sprite + sprite: Clothing/Head/Hats/dircap.rsi + - type: Clothing + sprite: Clothing/Head/Hats/dircap.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretLogi + name: logistics beret + description: For the intellectual and studious accountant. Definitely not a revolutionary symbol. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_lo.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_lo.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatBeretCorpsman + name: corpsman beret + description: For style-conscious combat lifesavers and medical specialists alike. + components: + - type: Sprite + sprite: Clothing/Head/Hats/beret_corpsman.rsi + - type: Clothing + sprite: Clothing/Head/Hats/beret_corpsman.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml index f31b38c20c7..f5fa843e59d 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/cloaks.yml @@ -56,7 +56,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakRd - name: mystagogue's cloak # DeltaV - Epistemics Department replacing Science + name: mystagogue's cloak description: A white cloak with violet stripes, showing your status as the arbiter of cutting-edge technology. components: - type: Sprite @@ -67,7 +67,7 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakQm - name: logistics officer's cloak # DeltaV - Logistics Department replacing Cargo + name: logistics officer's cloak description: A strong brown cloak with a reflective stripe, while not as fancy as others, it does show your managing skills. components: - type: Sprite @@ -272,3 +272,36 @@ - type: Sprite sprite: Clothing/Neck/Cloaks/pan.rsi +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakMystagogue + name: mystagogue's cloak + suffix: Delta-V + description: A comfy white and purple cloak, perfect for those sleepless nights when you're haunted by the yet unsolved mysteries of the universe. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/mystacloak.rsi + - type: Clothing + sprite: Clothing/Neck/Cloaks/mystacloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakBoat + name: NanoTrasen boat cloak + description: A regal blue durathread boat cloak with a red felt lining and gold trim. Somehow, it's even more expensive than it looks. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/boatcloak.rsi + - type: Clothing + sprite: Clothing/Neck/Cloaks/boatcloak.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckSalvager + name: salvager's cloak + description: Worn by dangerous people who've deconstructed stations with ease. + components: + - type: Sprite + sprite: Clothing/Neck/Cloaks/salvage.rsi + - type: Clothing + sprite: Clothing/Neck/Cloaks/salvage.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml index 7b4ab078911..16116900611 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/mantles.yml @@ -74,3 +74,15 @@ sprite: Clothing/Neck/mantles/qmmantle.rsi - type: Clothing sprite: Clothing/Neck/mantles/qmmantle.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckMantleRyuzo + name: ornate mantle + description: In days of old, giving one's life was considered the ultimate sacrifice. The owner of this mantle, however, has dedicated their life twice over. + suffix: ADMIN ONLY, DO NOT MAP + components: + - type: Sprite + sprite: Clothing/Neck/mantles/ryuzo.rsi + - type: Clothing + sprite: Clothing/Neck/mantles/ryuzo.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml index e76a4b3ee3b..dba2104a3ac 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml @@ -100,3 +100,14 @@ sprite: DeltaV/Clothing/Neck/Medals/clownmedal.rsi # DeltaV - resprite - type: StealTarget stealGroup: ClothingNeckClownmedal + +- type: entity + parent: ClothingNeckMedalBase + id: ClothingNeckBlackStar + name: black star medal + description: Given to crewmates that make the greatest of sacrifices in the performance of their duties. + components: + - type: Sprite + sprite: Clothing/Neck/Medals/blackstar.rsi + - type: Clothing + sprite: Clothing/Neck/Medals/blackstar.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml index 9e361d59192..1347b265c61 100644 --- a/Resources/Prototypes/Entities/Clothing/Neck/ties.yml +++ b/Resources/Prototypes/Entities/Clothing/Neck/ties.yml @@ -1,3 +1,7 @@ +# TODO: THIS IS DUMB. EVERY NECK CATEGORY IS WILDLY DIFFERENT FROM EACHOTHER. +# THEY NEED BASEPARENTS LIKE CLOTHINGNECKTIEBASE WITH TAGS DEFINED +# - DANGERREVOLUTION + - type: entity parent: ClothingNeckBase id: ClothingNeckTieRed @@ -40,3 +44,69 @@ - ClothMade - HamsterWearable - WhitelistChameleon + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieWhite + name: white tie + description: An ivory-white tie. + components: + - type: Sprite + sprite: Clothing/Neck/Ties/whitetie.rsi + - type: Clothing + sprite: Clothing/Neck/Ties/whitetie.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieBlack + name: black tie + description: A charcoal-black tie. + components: + - type: Sprite + sprite: Clothing/Neck/Ties/blacktie.rsi + - type: Clothing + sprite: Clothing/Neck/Ties/blacktie.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieBrown + name: brown tie + description: A chocolate-brown tie. + components: + - type: Sprite + sprite: Clothing/Neck/Ties/browntie.rsi + - type: Clothing + sprite: Clothing/Neck/Ties/browntie.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieBlue + name: blue tie + description: A cerulean-blue tie. + components: + - type: Sprite + sprite: Clothing/Neck/Ties/bluetie.rsi + - type: Clothing + sprite: Clothing/Neck/Ties/bluetie.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieGreen + name: green tie + description: A grass-green tie. + components: + - type: Sprite + sprite: Clothing/Neck/Ties/greentie.rsi + - type: Clothing + sprite: Clothing/Neck/Ties/greentie.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckTieChem + name: chemistry tie + description: An safety-orange tie. + components: + - type: Sprite + sprite: Clothing/Neck/Ties/chemtie.rsi + - type: Clothing + sprite: Clothing/Neck/Ties/chemtie.rsi diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index fdaee45ccc8..f70cac368fc 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -305,3 +305,73 @@ Piercing: 0.6 Heat: 0.5 - type: GroupExamine + +#Basic armor vest replacement +- type: entity + parent: ClothingOuterBaseMedium + id: ClothingOuterArmorPlateCarrier + name: plate carrier + description: A large and bulky carrier featuring steel plates that offer decent protection against gunfire. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi + - type: Armor # Good against gunshots, decent against everything else. Balanced by reduced movement speed. + modifiers: + coefficients: + Blunt: 0.80 + Slash: 0.80 + Piercing: 0.50 + Heat: 0.80 + - type: ClothingSpeedModifier + walkModifier: 0.90 + sprintModifier: 0.90 + - type: ExplosionResistance # More protective against explosives than you think. Helps in preventing all those vital organs from jiggling around o.o + damageCoefficient: 0.70 + +#Alternate / slim basic armor vest replacement +- type: entity + parent: ClothingOuterBaseMedium + id: ClothingOuterArmorDuraVest + name: durathread vest + description: A tight-fitting and sturdy armor vest, reinforced with durathread weave to protect against sharp objects and blunt force trauma. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Armor/duravest.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Armor/duravest.rsi + - type: Armor # Good against stabs and knocks, offers minimal protection from gunshots and lasfire. + modifiers: + coefficients: + Blunt: 0.60 + Slash: 0.60 + Piercing: 0.90 + Heat: 0.90 + - type: ExplosionResistance # Better than nothing against a blast or shockwave. + damageCoefficient: 0.90 + +- type: entity + parent: ClothingOuterBaseLarge + id: ClothingOuterArmorARC + name: ARCS + description: The Advanced Riot Control Suit, or ARCS for short, is generally regarded as far too bulky and overly hot for any practical use - but when the riots are raging, most officers invariably take great comfort from the thick and claustrophobic padding. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Armor/riot.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.40 + Slash: 0.40 + Piercing: 0.70 + Heat: 0.70 + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 + - type: ExplosionResistance # Almost as good as a plate carrier! Still not going to save you from most bombs though. + damageCoefficient: 0.80 + - type: GroupExamine + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 41d6990baaa..c103975440c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -409,3 +409,130 @@ sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/expensive_coat.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatRyuzo + name: Delphic coat + description: In another universe, The Syndicate are known as the good guys. + suffix: ADMIN ONLY, DO NOT MAP + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatHoPArmored + name: head of personnel's armored coat + description: A comfortable jacket that offers some protection against acts of god and man. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/hop.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/hop.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.8 + Slash: 0.8 + Piercing: 0.8 + Heat: 0.8 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatOvercoat + name: overcoat + description: A warm, dark overcoat, suitable for formal occasions. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Slash: 0.9 + Heat: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatGreatcoat + name: greatcoat + description: A drab and rugged greatcoat, padded for protection against the elements. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor # MAKE SURE THE STATS ALIGN WITH SEC WINTER COAT!!! + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatLeatherJacket + name: leather jacket + description: A rugged leather jacket, for fashion or for utility. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Slash: 0.9 + Heat: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatCybersunWindbreaker + name: cybersun windbreaker + description: A paramedics windbreaker, sporting the official heraldry of Cybersuns meditech division. Its made of sturdy ballistic fiber. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi + - type: TemperatureProtection + coefficient: 0.1 + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Slash: 0.95 + Piercing: 0.95 + Heat: 0.75 + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatHoPFormal + name: head of personnel's formal jacket + description: A showy and over-the-top jacket with gold buttons and red trim. More tacky than classy. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi + - type: TemperatureProtection + coefficient: 0.1 + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index a05d346c2f2..93efd2b95ba 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -987,3 +987,180 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitSanta + +# Standard Combat Hardsuits +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitCombatStandard + name: combat hardsuit + description: A purpose-built combat suit designed to protect its user against all manner of enemy combatants in low pressure environments. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi + - type: PressureProtection + highPressureMultiplier: 0.50 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.50 + - type: Armor # Good armour resistance across the board, comparable to the standard security hardsuit. + modifiers: + coefficients: + Blunt: 0.60 + Slash: 0.60 + Piercing: 0.60 + Radiation: 0.75 + Caustic: 0.75 + Heat: 0.75 + - type: ClothingSpeedModifier + walkModifier: 0.75 + sprintModifier: 0.75 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCombatStandard + +- type: entity + parent: ClothingOuterHardsuitCombatStandard + id: ClothingOuterHardsuitCombatOfficer + name: security combat hardsuit + description: A purpose-built combat suit designed to protect its user against all manner of enemy combatants in low pressure environments. This one has station security markings. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCombatOfficer + +# Medical Combat Hardsuits +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitCombatMedical + name: medical combat hardsuit + description: A purpose-built combat suit designed to allow its user greater mobility for superior support of friendly units in active combat zones. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi + - type: PressureProtection # Less protective from high pressure than a standard hardsuit due to less plating. + highPressureMultiplier: 0.60 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.60 + - type: Armor # Slightly less armour than the standard hardsuit, but far higher mobility. + modifiers: + coefficients: + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.65 + Radiation: 0.80 + Caustic: 0.80 + Heat: 0.80 + - type: ClothingSpeedModifier + walkModifier: 0.85 + sprintModifier: 0.85 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCombatMedical + +- type: entity + parent: ClothingOuterHardsuitCombatMedical + id: ClothingOuterHardsuitCombatCorpsman + name: corpsman combat hardsuit + description: A purpose-built combat suit designed to allow its user greater mobility for superior support of friendly units in active combat zones. This one has station security markings. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCombatCorpsman + +# Riot Combat Hardsuits +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitCombatRiot + name: riot combat hardsuit + description: A purpose-built combat suit designed for crowd control against armed combatants in low pressure environments. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi + - type: PressureProtection + highPressureMultiplier: 0.45 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.40 + - type: Armor # More protective than a standard security hardsuit, but far slower. + modifiers: + coefficients: + Blunt: 0.50 + Slash: 0.50 + Piercing: 0.50 + Radiation: 0.70 + Caustic: 0.70 + Heat: 0.70 + - type: ClothingSpeedModifier + walkModifier: 0.65 + sprintModifier: 0.65 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCombatRiot + +- type: entity + parent: ClothingOuterHardsuitCombatRiot + id: ClothingOuterHardsuitCombatWarden + name: warden's riot combat hardsuit + description: A purpose-built combat suit designed for crowd control against armed combatants in low pressure environments. This one has station security and warden's rank markings. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCombatWarden + +# Advanced Combat Hardsuits +- type: entity + parent: ClothingOuterHardsuitBase + id: ClothingOuterHardsuitCombatAdvanced + name: advanced combat hardsuit + description: A purpose-built combat suit of second-generation design, providing unparalleled protection against all manner of kinetic forces in low pressure environments. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi + - type: PressureProtection + highPressureMultiplier: 0.40 + lowPressureMultiplier: 1000 + - type: ExplosionResistance + damageCoefficient: 0.40 + - type: Armor # About as protective as a riot hardsuit but with far less movement penalty. + modifiers: + coefficients: + Blunt: 0.50 + Slash: 0.50 + Piercing: 0.50 + Radiation: 0.75 + Caustic: 0.75 + Heat: 0.75 + - type: ClothingSpeedModifier + walkModifier: 0.80 + sprintModifier: 0.80 + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCombatAdvanced + +- type: entity + parent: ClothingOuterHardsuitCombatAdvanced + id: ClothingOuterHardsuitCombatHoS + name: head of security's advanced combat hardsuit + description: A purpose-built combat suit of second-generation design, providing unparalleled protection against all manner of kinetic forces in low pressure environments. This one has station security and commander's rank markings. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHelmetHardsuitCombatHoS + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index bd82df57d43..7592bb62036 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -374,3 +374,22 @@ sprite: Clothing/OuterClothing/Misc/red_racoon.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/red_racoon.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterApronChemist + name: chemical resistant apron + suffix: Chemistry + description: Made out of thick rubber, the color of this apron still leaves you perplexed. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.25 + - type: TemperatureProtection + coefficient: 1 + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml index f49f5f4804b..304eb98cfab 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/vests.yml @@ -75,3 +75,44 @@ sprite: Clothing/OuterClothing/Vests/vest.rsi - type: Clothing sprite: Clothing/OuterClothing/Vests/vest.rsi + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterVestFlak + name: flak jacket + description: A dusty and weathered flak jacket. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Vests/flak.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Vests/flak.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.75 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 + +- type: entity + parent: ClothingOuterBase + id: ClothingOuterVestFlakPress + name: flak jacket (press) + description: A flak jacket for reporters in wartorn zones. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.75 + Heat: 0.9 + - type: ExplosionResistance + damageCoefficient: 0.9 + diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 4f0a0d0aafa..b67329fba59 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -541,3 +541,62 @@ Quantity: 20 - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterWeb + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterWinterCCWarden + name: central command's armored winter coat + description: A tough, utilitarian coat designed for the wardens of Central Command. Reinforced kevlar plating and high quality fur allow the user to look stylish while staying protected. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.7 + Piercing: 0.4 #Stronger than the warden's armored jacket, because shenanigans and CC spends alot of money. + Heat: 0.75 + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterCorporateJacket + name: Nanotrasen Corporate Jacket + description: A cozy jacket with the Nanotrasen logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterDenimJacket + name: Denim jacket + description: A jean jacket with a warm inner lining. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterStasecSweater + name: station security sweater + description: A thick synthetic sweater with reinforced shoulders and elbows, enough to warm even the harshest security officer's cold heart. + components: + - type: Sprite + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi + - type: Clothing + sprite: DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi + - type: Armor # Keep this the same as the sec winter coat + modifiers: + coefficients: + Blunt: 0.85 + Slash: 0.85 + Piercing: 0.85 + Heat: 0.75 + diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml index 241fc45352a..7f770102338 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/boots.yml @@ -231,4 +231,27 @@ - type: Sprite sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi - type: Clothing - sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi \ No newline at end of file + sprite: Clothing/Shoes/Boots/cowboybootsfancy.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesBootsRyuzo + name: rugged fur boots + description: These would be perfect for chilly winter walks out in the forests - if they still existed, that is. + suffix: ADMIN ONLY, DO NOT MAP + components: + - type: Sprite + sprite: DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi + - type: Clothing + sprite: DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesBootsFishing + name: fishing boots + description: Smells fishy! + components: + - type: Sprite + sprite: DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi + - type: Clothing + sprite: DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index ee1708caef6..e9a8ca7a3bc 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -130,3 +130,14 @@ event: !type:ToggleClothingSpeedEvent icon: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon } iconOn: { sprite: Clothing/Shoes/Boots/speedboots.rsi, state: icon-on } + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesMiscWhite + name: white leather shoes + description: Impeccably shined white leather shoes. Don't tread on these tootsies. + components: + - type: Sprite + sprite: DeltaV/Clothing/Shoes/Misc/whiteleather.rsi + - type: Clothing + sprite: DeltaV/Clothing/Shoes/Misc/whiteleather.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml index 4a49c804cdb..030f935eb04 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/specific.yml @@ -231,3 +231,18 @@ - type: FootstepModifier footstepSoundCollection: collection: FootstepSkates + +- type: entity + parent: ClothingShoesBase + id: ClothingShoesEnclosedChem + name: enclosed shoes + description: Those shoes will protect you from melting your feet while working. + components: + - type: Sprite + sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi + - type: Clothing + sprite: DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.95 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml b/Resources/Prototypes/Entities/Clothing/Shoes/winter-boots.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Clothing/Shoes/winter-boots.yml rename to Resources/Prototypes/Entities/Clothing/Shoes/winter-boots.yml diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index d98207da371..a90e94b263e 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -24,7 +24,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtCargo name: cargo tech jumpskirt - description: A sturdy jumpskirt, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo + description: A sturdy jumpskirt, issued to members of the Logistics department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/cargotech.rsi @@ -167,12 +167,12 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtHoS name: head of security's jumpskirt - description: A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. # DeltaV - improved description + description: A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/hos.rsi - type: entity parent: ClothingUniformSkirtBase @@ -254,13 +254,13 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtBrigmedic - name: corpsman jumpskirt # DeltaV - renamed brigmedic to corpsman + name: corpsman jumpskirt description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/brigmedic.rsi - type: entity parent: ClothingUniformSkirtBase @@ -280,7 +280,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtQM - name: logistics officer's jumpskirt # DeltaV - Logistics Department replacing Cargo + name: logistics officer's jumpskirt description: 'What can brown do for you?' components: - type: Sprite @@ -291,7 +291,7 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtQMTurtleneck - name: logistics officer's turtleneck # DeltaV - Logistics Department replacing Cargo + name: logistics officer's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. components: - type: Sprite @@ -302,8 +302,8 @@ - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtResearchDirector - name: mystagogue's turtleneck # DeltaV - Epistemics Department replacing Science - description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # DeltaV - Epistemics Department replacing Science + name: mystagogue's turtleneck + description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/rnd.rsi @@ -336,23 +336,23 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSec name: security jumpskirt - description: A charcoal skirt and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. # DeltaV - improved description + description: A charcoal skirt and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/security.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/security.rsi - type: entity parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtWarden - name: warden's jumpskirt # DeltaV - renamed to mirror other security uniforms - description: Red shirt on a charcoal skirt, with white markings and epaulettes that denote a warden's rank. # DeltaV - improved description + name: warden's jumpskirt + description: Red shirt on a charcoal skirt, with white markings and epaulettes that denote a warden's rank. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/warden.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/warden.rsi # COLORS @@ -760,7 +760,7 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSeniorResearcher name: senior researcher jumpskirt - description: A sign of skill and prestige within the epistemics department. # DeltaV - Epistemics Department replacing Science + description: A sign of skill and prestige within the epistemics department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpskirt/senior_researcher.rsi @@ -793,12 +793,12 @@ parent: ClothingUniformSkirtBase id: ClothingUniformJumpskirtSecGrey name: grey security jumpskirt - description: A light grey shirt with bright red highlights, for dedicated and responsive security officers. # DeltaV - improved description + description: A light grey shirt with bright red highlights, for dedicated and responsive security officers. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/security_grey.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpskirt/security_grey.rsi - type: entity parent: ClothingUniformSkirtBase @@ -920,3 +920,99 @@ - state: equipped-INNERCLOTHING-jumpskirt - state: equipped-INNERCLOTHING-shirt color: "#b30000" + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtHoPMess + name: head of personnel's mess kit + description: A swanky uniform with tasteful gold and red trim. Keep your latte away from this. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/hopmesskit.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/hopmesskit.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformSkirtCourier + name: courier's jumpskirt + description: Enemy of dogs everywhere. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/courier.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/courier.rsi + +# Security alt uniforms + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtSecBlue + name: blue security jumpskirt + description: A cool blue shirt over charcoal skirt, for the calm and collected security officer. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/security_blue.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/security_blue.rsi + +# Warden alt uniforms + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtWardenBlue + name: blue warden's jumpskirt + description: A cool blue shirt with ice-white markings and warden's epaulettes. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/warden_blue.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/warden_blue.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtWardenGrey + name: grey warden's jumpskirt + description: Charcoal skirt, a grey shirt, and white warden's markings and epaulettes. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/warden_grey.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/warden_grey.rsi + +# HoS alt uniforms + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtHoSBlue + name: head of security's blue jumpskirt + description: A blue Station Security shirt with charcoal skirt. Features gold emblems and commander's epaulettes. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/hos_blue.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/hos_blue.rsi + +- type: entity + parent: ClothingUniformSkirtBase + id: ClothingUniformJumpskirtHoSGrey + name: head of security's grey jumpskirt + description: A grey Station Security shirt with charcoal skirt. Stands out with red highlights, gold emblems, and commander's epaulettes. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/hos_grey.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/hos_grey.rsi + +# Central Command Uniform - ported from Velta + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpskirtCentcomDirector + name: director's jumpskirt + description: A sharp and professional jumpskirt worn by a high-ranking member of Central Command. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpskirt/centcom_officer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpskirt/centcom_officer.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 7c38f720a35..3158cbb0ea4 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -72,7 +72,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitCargo name: cargo tech jumpsuit - description: A sturdy jumpsuit, issued to members of the Logistics department. # DeltaV - Logistics Department replacing Cargo + description: A sturdy jumpsuit, issued to members of the Logistics department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/cargotech.rsi @@ -86,9 +86,9 @@ description: It's a snappy jumpsuit with a sturdy set of overalls. It's very dirty. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi # DeltaV - Salvage better looking uniform + sprite: Clothing/Uniforms/Jumpsuit/explorer.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi # DeltaV - Salvage better looking uniform + sprite: Clothing/Uniforms/Jumpsuit/explorer.rsi - type: entity parent: ClothingUniformBase @@ -323,12 +323,12 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitHoS name: head of security's jumpsuit - description: A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. # DeltaV - improved description + description: A standard Station Security uniform, adorned with gold emblems and commander's epaulettes. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos.rsi - type: entity parent: ClothingUniformBase @@ -345,23 +345,23 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitHoSBlue name: head of security's blue jumpsuit - description: A blue Station Security shirt with charcoal trousers. Features gold emblems and commander's epaulettes. # DeltaV - improved description + description: A blue Station Security shirt with charcoal trousers. Features gold emblems and commander's epaulettes. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos_blue.rsi - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitHoSGrey name: head of security's grey jumpsuit - description: A grey Station Security shirt with charcoal trousers. Stands out with red highlights, gold emblems, and commander's epaulettes. # DeltaV - improved description + description: A grey Station Security shirt with charcoal trousers. Stands out with red highlights, gold emblems, and commander's epaulettes. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/hos_grey.rsi - type: entity parent: ClothingUniformBase @@ -443,13 +443,13 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitBrigmedic - name: corpsman jumpsuit # DeltaV - rename brigmedic to corpsman + name: corpsman jumpsuit description: This uniform is issued to qualified personnel who have been trained. No one cares that the training took half a day. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/brigmedic.rsi - type: entity parent: ClothingUniformBase @@ -474,7 +474,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQM - name: logistics officer's jumpsuit # DeltaV - Logistics Department replacing Cargo + name: logistics officer's jumpsuit description: 'What can brown do for you?' components: - type: Sprite @@ -485,7 +485,7 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQMTurtleneck - name: logistics officer's turtleneck # DeltaV - Logistics Department replacing Cargo + name: logistics officer's turtleneck description: A sharp turtleneck made for the hardy work environment of supply. components: - type: Sprite @@ -496,10 +496,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitQMFormal - # DeltaV - Logistics Department - Replace Quartermaster with Logistics Officer name: logistics officer's formal suit description: Inspired by the logistics officers of military's past, the perfect outfit for supplying a formal occasion. - # End of modified code components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/qmformal.rsi @@ -509,8 +507,8 @@ - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitResearchDirector - name: mystagogue's turtleneck # DeltaV - Epistemics Department replacing Science - description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. # DeltaV - Epistemics Department replacing Science + name: mystagogue's turtleneck + description: It's a turtleneck worn by those with the know-how to achieve the position of Mystagogue. Its fabric provides minor protection from biological contaminants. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/rnd.rsi @@ -554,45 +552,45 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitSec name: security jumpsuit - description: Charcoal trousers and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. # DeltaV - improved description + description: Charcoal trousers and a dull red shirt, the standard-issue uniform of the infamous Station Security Department. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security.rsi - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSecBlue - name: blue security jumpsuit # DeltaV - renamed to mirror other security uniforms - description: A cool blue shirt over charcoal trousers, for the calm and collected security officer. # DeltaV - improved description + name: blue security jumpsuit + description: A cool blue shirt over charcoal trousers, for the calm and collected security officer. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security_blue.rsi - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitSecGrey name: grey security jumpsuit - description: A light grey shirt with bright red highlights, for dedicated and responsive security officers. # DeltaV - improved description + description: A light grey shirt with bright red highlights, for dedicated and responsive security officers. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/security_grey.rsi - type: entity parent: ClothingUniformBase id: ClothingUniformJumpsuitWarden - name: warden's jumpsuit # DeltaV - renamed to mirror other security uniforms - description: Red shirt on charcoal trousers, with white markings and epaulettes that denote a warden's rank. # DeltaV - improved description + name: warden's jumpsuit + description: Red shirt on charcoal trousers, with white markings and epaulettes that denote a warden's rank. components: - type: Sprite - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/warden.rsi - type: Clothing - sprite: DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi # DeltaV - resprite + sprite: Clothing/Uniforms/Jumpsuit/warden.rsi # COLORS @@ -1279,7 +1277,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitSeniorResearcher name: senior researcher jumpsuit - description: A sign of skill and prestige within the epistemics department. # DeltaV - Epistemics Department replacing Science + description: A sign of skill and prestige within the epistemics department. components: - type: Sprite sprite: Clothing/Uniforms/Jumpsuit/senior_researcher.rsi @@ -1461,3 +1459,260 @@ sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/familiar_garbs.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitHoPMess + name: head of personnel's mess kit + description: A swanky uniform with tasteful gold and red trim. Keep your latte away from this. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/hopmesskit.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/hopmesskit.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitBoatswain + name: boatswain's turtleneck + description: A comfortable rollneck and slacks. Suitable attire for a pipe-smoking bosun. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/boatswain.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/boatswain.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitBlack + name: black suit + description: A crisp white shirt and charcoal slacks. Reminds you of the old times. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitblack.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitblack.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitBlackAlt + name: dark suit + description: A crisp grey shirt and charcoal slacks. Reminds you of overcast days. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitblackalt.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitblackalt.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitBlackMob + name: mobster's attire + description: A crisp red shirt and charcoal slacks. Reminds you of your debts. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitblackmob.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitblackmob.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitBrown + name: brown suit + description: A crisp white shirt and chocolate slacks. Reminds you of dusty offices. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitbrown.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitbrown.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitBrownAlt + name: suspicious suit + description: A crisp grey shirt and chocolate slacks. Reminds you of clandestine operators. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitBrownMob + name: gangster's attire + description: A crisp red shirt and chocolate slacks. Reminds you of drivebys. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitWhite + name: white suit + description: A crisp white shirt and ivory slacks. Reminds you of swans. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitwhite.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitwhite.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitWhiteAlt + name: negative suit + description: A crisp grey shirt and ivory slacks. Reminds you of daguerreotypes. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSuitWhiteMob + name: mafioso's attire + description: A crisp red shirt and ivory slacks. Reminds you of family. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSecFormal + name: security formal suit + description: A ceremonial piece of Station Security kit, for special occasions of any kind. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/secformal.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/secformal.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitSober + name: sober sweater + description: For the more lucid moments. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/sober.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/sober.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitLostTourist + name: lost tourist uniform + description: The uniform of those who just want to relax on a beach... Where is the beach anyway? + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/lost_tourist.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/lost_tourist.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitJeansRed + name: red sweater with jeans + description: A red sweater with blue jeans. This one has the dominant jeans. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/jeans_red.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/jeans_red.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitJeansGreen + name: green sweater with jeans + description: A green sweater with blue jeans. This one has the recessive jeans. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/jeans_green.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/jeans_green.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitJeansBrown + name: brown sweater with jeans + description: A brown sweater with blue jeans. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/jeans_brown.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/jeans_brown.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformCourier + name: courier's uniform + description: + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/courier.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/courier.rsi + +# Warden alt uniforms + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitWardenBlue + name: blue warden's jumpsuit + description: A cool blue shirt with ice-white markings and warden's epaulettes. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/warden_blue.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/warden_blue.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitWardenGrey + name: grey warden's jumpsuit + description: Charcoal pants, a grey shirt, and white warden's markings and epaulettes. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/warden_grey.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/warden_grey.rsi + +# Central Command Uniform - ported from Velta + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitCentcomDirector + name: director's jumpsuit + description: A sharp and professional jumpsuit worn by a high-ranking member of Central Command. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/centcom_officer.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitKilt + name: kilt + description: A fine bit o' garb for the lad an' lasses. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/kilt.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/kilt.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitChemShirt + name: formal chemistry suit + description: There's still some odd stains on this suit. Hm. + components: + - type: Sprite + sprite: Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi + - type: Clothing + sprite: Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml index a75a07c6995..5d32276fbfe 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/scrubs.yml @@ -30,3 +30,69 @@ sprite: Clothing/Uniforms/Scrubs/blue.rsi - type: Clothing sprite: Clothing/Uniforms/Scrubs/blue.rsi + +- type: entity + parent: ClothingUniformBase + id: UniformScrubsColorBlack + name: black scrubs + description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. + components: + - type: Sprite + sprite: Clothing/Uniforms/Scrubs/black.rsi + - type: Clothing + sprite: Clothing/Uniforms/Scrubs/black.rsi + +- type: entity + parent: ClothingUniformBase + id: UniformScrubsColorCyan + name: cyan scrubs + description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. + components: + - type: Sprite + sprite: Clothing/Uniforms/Scrubs/cyan.rsi + - type: Clothing + sprite: Clothing/Uniforms/Scrubs/cyan.rsi + +- type: entity + parent: ClothingUniformBase + id: UniformScrubsColorPink + name: pink scrubs + description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. + components: + - type: Sprite + sprite: Clothing/Uniforms/Scrubs/pink.rsi + - type: Clothing + sprite: Clothing/Uniforms/Scrubs/pink.rsi + +- type: entity + parent: ClothingUniformBase + id: UniformScrubsColorRainbow + name: rainbow scrubs + description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. + components: + - type: Sprite + sprite: Clothing/Uniforms/Scrubs/rainbow.rsi + - type: Clothing + sprite: Clothing/Uniforms/Scrubs/rainbow.rsi + +- type: entity + parent: ClothingUniformBase + id: UniformScrubsColorWhite + name: white scrubs + description: A combination of comfort and utility intended to make removing every last organ someone has and selling them to a space robot much more official looking. + components: + - type: Sprite + sprite: Clothing/Uniforms/Scrubs/white.rsi + - type: Clothing + sprite: Clothing/Uniforms/Scrubs/white.rsi + +- type: entity + parent: ClothingUniformBase + id: UniformScrubsColorCybersun + name: cybersun scrubs + description: The official uniform of Cybersun's biotechnology division + components: + - type: Sprite + sprite: Clothing/Uniforms/Scrubs/cybersun.rsi + - type: Clothing + sprite: Clothing/Uniforms/Scrubs/cybersun.rsi diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/miningrock.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Markers/Spawners/Random/miningrock.yml rename to Resources/Prototypes/Entities/Markers/Spawners/Random/miningrock.yml diff --git a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml index 3da346cdd65..79699688914 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/ghost_roles.yml @@ -153,3 +153,69 @@ - state: green - sprite: Mobs/Species/Terminator/parts.rsi state: full + +- type: entity + id: SpawnPointPlayerCharacter + name: ghost role spawn point + suffix: player character, DO NOT MAP + parent: MarkerBase + components: + - type: GhostRole + name: Roleplay Ghost Role + description: Placeholder + rules: Placeholder + - type: GhostRoleCharacterSpawner + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: Mobs/Species/Human/parts.rsi + state: full + +- type: entity # Part of PirateRadioSpawn + noSpawn: true + id: SpawnPointGhostSyndicateListener + name: ghost role spawn point + suffix: syndicate listener + parent: MarkerBase + components: + - type: GhostRole + name: ghost-role-information-listeningop-name + description: ghost-role-information-listeningop-description + rules: ghost-role-information-listeningop-rules + requirements: # Worth considering these numbers for the goal of making sure someone willing to MRP takes this. + - !type:OverallPlaytimeRequirement + time: 259200 # 72 hours + - !type:DepartmentTimeRequirement + department: Security + time: 40000 # 11.1 hours + - !type:DepartmentTimeRequirement + department: Civilian + time: 40000 # 11.1 hours + - !type:DepartmentTimeRequirement + department: Command + time: 40000 # 11.1 hours + - type: GhostRoleMobSpawner + prototype: MobHumanSyndicateListener + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + - sprite: Structures/Wallmounts/signs.rsi + state: radiation + +- type: entity + parent: MarkerBase + id: SpawnPointGhostParadoxAnomaly + name: paradox anomaly spawn point + components: + - type: GhostRole + name: ghost-role-information-paradox-anomaly-name + description: ghost-role-information-paradox-anomaly-description + rules: ghost-role-information-paradox-anomaly-rules + - type: ParadoxAnomalySpawner + - type: Sprite + sprite: Markers/jobs.rsi + layers: + - state: green + diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 20a42d721f6..12c833fbb3d 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -648,3 +648,19 @@ layers: - state: green - state: zookeeper + +- type: entity + id: SpawnPointMedicalBorg + parent: SpawnPointJobBase + name: medical cyborg + components: + - type: SpawnPoint + job_id: MedicalBorg + - type: Sprite + layers: + - state: green + - sprite: Mobs/Silicon/chassis.rsi + state: medical + - sprite: Mobs/Silicon/chassis.rsi + state: medical_e + diff --git a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml index a59c7d59517..dce273a7601 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/mobs.yml @@ -849,3 +849,43 @@ - type: ConditionalSpawner prototypes: - MobLuminousEntity + +- type: entity + name: Arctic Fox Siobhan Spawner + id: SpawnMobArcticFoxSiobhan + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobArcticFoxSiobhan + +- type: entity + name: Sec Dog Laika Spawner + id: SpawnMobSecDogLaika + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobSecDogLaika + +- type: entity + name: Syndicate Guard Spawner + id: SpawnMobRadioGuard + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - state: ai + - type: ConditionalSpawner + prototypes: + - MobRadioGuard + diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/felinid.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/felinid.yml rename to Resources/Prototypes/Entities/Mobs/Customization/Markings/felinid.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/hair.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml rename to Resources/Prototypes/Entities/Mobs/Customization/Markings/hair.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/harpy.yml rename to Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/vulpkanin.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/vulpkanin.yml rename to Resources/Prototypes/Entities/Mobs/Customization/Markings/vulpkanin.yml diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 7af568b40c9..78a3897277d 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -3201,4 +3201,182 @@ components: - type: ReplacementAccent accent: nymph - \ No newline at end of file + +- type: entity + name: arctic fox + parent: SimpleMobBase + id: MobArcticFox + description: Wears a regal coat of snowy elegance, belying its cold and resourceful nature. + components: + - type: Sprite + drawdepth: Mobs + sprite: DeltaV/Mobs/Pets/arcticfox.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: arcticfox + - type: Physics + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 50 #They actually are pretty light, I looked it up + mask: + - MobMask + layer: + - MobLayer + - type: Appearance + - type: Inventory + speciesId: arcticfox + templateId: pet + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: DamageStateVisuals + states: + Alive: + Base: arcticfox + Critical: + Base: arcticfox_crit + Dead: + Base: arcticfox_dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 3 + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-soft-floofy + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/Animals/fox_squeak.ogg + - type: Temperature + coldDamageThreshold: 210 + coldDamage: + types: + Cold: 0.1 + - type: Grammar + attributes: + gender: epicene + - type: Bloodstream + bloodMaxVolume: 100 + - type: MobPrice + price: 400 + - type: Tag + tags: + - VimPilot + +- type: entity + name: security dog + parent: SimpleMobBase + id: MobSecDog + description: Funnily enough, this pig is actually a dog. + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: "sentient security dog" + description: "Help out the security team by biting the baddies and barking at everything that moves." + - type: GhostTakeoverAvailable + - type: CombatMode + - type: MovementSpeedModifier + baseWalkSpeed : 3.5 + baseSprintSpeed : 5.0 + - type: NpcFactionMember + factions: + - PetsNT + - type: Sprite + drawdepth: Mobs + sprite: DeltaV/Mobs/Pets/secdog.rsi + layers: + - map: ["enum.DamageStateVisualLayers.Base"] + state: secdog + - type: HTN + rootTask: + task: SimpleHostileCompound + - type: Physics + - type: Speech + speechVerb: Canine + speechSounds: Vulpkanin + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.35 + density: 120 # BIG DOG :3 + mask: + - MobMask + layer: + - MobLayer + - type: MobThresholds + thresholds: # BIG DOG. STRONG DOG + 0: Alive + 100: Critical + 200: Dead + - type: StaminaDamageOnHit + damage: 22 + - type: MeleeWeapon + hidden: true + altDisarm: false + soundHit: + path: /Audio/Effects/bite.ogg + angle: 0 + attackRate: 1 + damage: + types: + Slash: 10 + - type: SlowOnDamage + speedModifierThresholds: + 40: 0.70 + 80: 0.30 + - type: Appearance + - type: Inventory + speciesId: secdog + templateId: secdog + - type: InventorySlots + - type: Strippable + - type: UserInterface + interfaces: + - key: enum.StrippingUiKey.Key + type: StrippableBoundUserInterface + - type: DamageStateVisuals + states: + Alive: + Base: secdog + Critical: + Base: secdog_crit + Dead: + Base: secdog_dead + - type: Butcherable + spawned: + - id: FoodMeat + amount: 2 + - type: ReplacementAccent + accent: dog + - type: InteractionPopup + successChance: 0.5 + interactSuccessString: petting-success-dog + interactFailureString: petting-failure-generic + interactSuccessSpawn: EffectHearts + interactSuccessSound: + path: /Audio/DeltaV/Voice/Vulpkanin/dog_bark2.ogg + - type: Grammar + attributes: + gender: epicene + - type: Bloodstream + bloodMaxVolume: 300 # BIG DOG. MUCH BLOOD :3 + - type: Puller + needsHands: false + - type: MobPrice + price: 400 + - type: Tag + tags: + - DoorBumpOpener + - VimPilot diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/Entities/Mobs/NPCs/familiars.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml rename to Resources/Prototypes/Entities/Mobs/NPCs/familiars.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml b/Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/glimmer_creatures.yml rename to Resources/Prototypes/Entities/Mobs/NPCs/glimmer_creatures.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml b/Resources/Prototypes/Entities/Mobs/NPCs/nukiemouse.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/nukiemouse.yml rename to Resources/Prototypes/Entities/Mobs/NPCs/nukiemouse.yml diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml index 98db5b2acff..92b49ece536 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/pets.yml @@ -810,17 +810,17 @@ name: Tropico parent: MobCrab id: MobCrabAtmos - description: The noble and stalwart defender of Atmosia. Viva! + description: The noble and stalwart defender of Atmosia. Viva! # TODO: ON DELTA THIS IS DETECTIVE PET. components: -# - type: GhostRole -# prob: 1 -# makeSentient: true -# allowSpeech: true -# allowMovement: true -# name: ghost-role-information-tropico-name -# description: ghost-role-information-tropico-description -# - type: GhostTakeoverAvailable -# - type: Flashable + - type: GhostRole + prob: 1 + makeSentient: true + allowSpeech: true + allowMovement: true + name: ghost-role-information-tropico-name + description: ghost-role-information-tropico-description + - type: GhostTakeoverAvailable + - type: Flashable - type: Tag tags: - VimPilot @@ -829,6 +829,63 @@ attributes: proper: true gender: male -# - type: AlwaysRevolutionaryConvertible + - type: AlwaysRevolutionaryConvertible # LONG LIVE DETECTOSIA?! - type: StealTarget stealGroup: AnimalTropico + +- type: entity + name: Siobhan + parent: MobArcticFox + id: MobArcticFoxSiobhan + description: Her name is pronounced "Shivahn", but she is known as Shivs by her associates. A fluffy, adorable arctic fox. + components: + - type: InteractionPopup + successChance: 1 + - type: Butcherable + spawned: + - id: FoodMeat + amount: 3 + - type: Grammar + attributes: + proper: true + gender: female + - type: Tag + tags: + - CannotSuicide + - VimPilot + +- type: entity + name: Laika + parent: MobSecDog + id: MobSecDogLaika + description: Much like her namesake, Laika is a specimen of indeterminate breed, fresh off the streets and ready to tussle. + components: + - type: GhostRole + makeSentient: true + allowSpeech: true + allowMovement: true + name: "Laika" + description: "Security's resident she-dog. Badger the officers for headpats and nip at the heels of violent offenders." + requirements: + - !type:DepartmentTimeRequirement + department: Security + time: 14400 # DeltaV - 4 hours + - type: GhostTakeoverAvailable + - type: InteractionPopup + successChance: 1 + - type: Butcherable + spawned: + - id: FoodMeat + amount: 2 + - type: Grammar + attributes: + proper: true + gender: female + - type: Loadout + prototypes: [ MobSecDogLaikaGear ] + - type: Tag + tags: + - CannotSuicide + - VimPilot + - DoorBumpOpener + diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml b/Resources/Prototypes/Entities/Mobs/NPCs/salvage.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/salvage.yml rename to Resources/Prototypes/Entities/Mobs/NPCs/salvage.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/Entities/Mobs/Player/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml rename to Resources/Prototypes/Entities/Mobs/Player/harpy.yml diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index b864984a7f3..f892cb9b0a0 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -87,3 +87,22 @@ nameSegments: - names_ninja_title - names_ninja + +- type: entity + noSpawn: true + parent: MobHumanSyndicateAgent + id: MobHumanSyndicateListener + name: Syndicate Listener + components: + - type: Loadout + prototypes: [SyndicateListenerGear] + - type: NpcFactionMember + factions: + - Syndicate + - type: AutoTraitor + giveUplink: false + giveObjectives: false + - type: AutoImplant + implants: + - DeathAcidifierImplant + diff --git a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml index ef15346a04d..8aacf65e095 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/humanoid.yml @@ -496,3 +496,83 @@ description: ghost-role-information-cluwne-description - type: GhostTakeoverAvailable - type: Cluwne + +- type: entity + id: RandomHumanoidSpawnerListener + name: Syndicate Listener + components: + - type: Sprite + sprite: Mobs/Species/Human/parts.rsi + state: full + - type: RandomHumanoidSpawner + settings: SyndicateListener + +- type: randomHumanoidSettings + id: SyndicateListener + components: + - type: Loadout + prototypes: [SyndicateListenerGear] + +# Mobsters + +- type: entity + id: RandomHumanoidSpawnerMobster + name: mobster + components: + - type: Sprite + netsync: false + sprite: DeltaV/Markers/jobs.rsi + state: mobster + - type: RandomMetadata + nameSegments: + - fake_human_first + - names_last + - type: RandomHumanoidSpawner + settings: Mobster + +- type: randomHumanoidSettings + id: Mobster + randomizeName: false + components: + - type: GhostRole + name: Mobster + description: Break kneecaps, spray lead, keep your mouth shut. + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ MobsterGear ] + - type: RandomMetadata + nameSegments: + - fake_human_first + - names_last + +- type: entity + id: RandomHumanoidSpawnerMobsterAlt + name: mobster + suffix: alt + components: + - type: Sprite + netsync: false + sprite: DeltaV/Markers/jobs.rsi + state: mobster + - type: RandomMetadata + nameSegments: + - fake_human_first + - names_last + - type: RandomHumanoidSpawner + settings: MobsterAlt + +- type: randomHumanoidSettings + id: MobsterAlt + randomizeName: false + components: + - type: GhostRole + name: Mobster + description: Break kneecaps, spray lead, keep your mouth shut. + - type: GhostTakeoverAvailable + - type: Loadout + prototypes: [ MobsterGearAlt ] + - type: RandomMetadata + nameSegments: + - fake_human_first + - names_last + diff --git a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml index 0f8998bdec8..64cb72bbf20 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/silicon.yml @@ -51,3 +51,24 @@ cell_slot: name: power-cell-slot-component-slot-name-default startingItem: PowerCellHyper + +- type: entity + id: PlayerBorgMedical + parent: BorgChassisMedical + suffix: Diagnosis, Treatment + components: + - type: ContainerFill + containers: + borg_brain: + - PositronicBrain + borg_module: + - BorgModuleDiagnosis + - BorgModuleTreatment + - type: ItemSlots + slots: + cell_slot: + name: power-cell-slot-component-slot-name-default + startingItem: PowerCellMedium + - type: RandomMetadata + nameSegments: [names_borg] + diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Player/vulpkanin.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml rename to Resources/Prototypes/Entities/Mobs/Player/vulpkanin.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/Entities/Mobs/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml rename to Resources/Prototypes/Entities/Mobs/Species/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Mobs/Species/vulpkanin.yml rename to Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index 33646b50bbe..44688d0ac09 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -2121,3 +2121,132 @@ - type: Icon sprite: Objects/Consumable/Drinks/bloodglass.rsi state: icon + +- type: entity + parent: DrinkGlassBase + id: DrinkHealthViolationGlass + name: health code violation + description: Allegedly it's a cocktail. The warning cone motif seems apt. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: HealthViolation + Quantity: 30 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGunmetalGlass + name: gunmetal glass + description: A cloudy mix of rum, cream, and... is that welding fuel? Probably tasty. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Gunmetal + Quantity: 30 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkLemonDropGlass + name: lemon drop + description: A martini glass filled with a translucent mix of refreshing lemony goodness. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: LemonDrop + Quantity: 30 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkGreenGrassGlass + name: green grass + description: An odd green cocktail, topped with oranges, ice, and a plastic straw. Curious. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: GreenGrass + Quantity: 30 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkDaiquiriGlass + name: classic daiquiri + description: Rum, lime, and simple syrup. Such class, such refinement. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Daiquiri + Quantity: 30 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkArsonistsBrewGlass + name: arsonist's brew + description: It's probably not concerning that it's glowing faintly. Or bubbling. Or smoking. No, not at all. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: ArsonistsBrew + Quantity: 30 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkKvassGlass + name: kvass glass + description: A cool refreshing drink with a taste of socialism. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Kvass + Quantity: 30 + - type: Sprite + sprite: Objects/Consumable/Drinks/kvass.rsi + +- type: entity + parent: DrinkGlassBase + id: DrinkMothamphetamineGlass + name: mothamphetamine + description: A strangely... Fuzzy drink. It has a chaotic aura. + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Mothamphetamine + Quantity: 30 + - type: Sprite + sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml index fe888595847..703d61f5b9c 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml @@ -500,3 +500,44 @@ - ReagentId: Theobromine Quantity: 2 # Tastes like tart, dark chocolate. + +- type: entity # TODO: CHECK THIS IS IN THE RANDOM FOOD SPAWNER. + name: pumpkin pie + parent: FoodPieBase + id: FoodPiePumpkin + description: A seasonal favorite, consisting mostly of pumpkin and a handful of spooky spices. + components: + - type: FlavorProfile + flavors: + - sweet + - pumpkin + - type: Sprite + layers: + - state: tin + - sprite: DeltaV/Objects/Consumable/Food/Baked/pie.rsi + state: pumpkin + - type: SliceableFood + slice: FoodPiePumpkinSlice + - type: Tag + tags: + - Fruit + - Pie + +- type: entity # TODO: CHECK THIS IS IN THE RANDOM FOOD SPAWNER. + name: slice of pumpkin pie + parent: FoodPieSliceBase + id: FoodPiePumpkinSlice + components: + - type: FlavorProfile + flavors: + - sweet + - pumpkin + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/Baked/pie.rsi + state: pumpkin-slice + - type: Tag + tags: + - Fruit + - Pie +# Tastes like pie, pumpkin. + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml index 5fbfe9c09b2..c5da4086531 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/meals.yml @@ -609,3 +609,27 @@ Quantity: 4 - ReagentId: Vitamin Quantity: 4 + +- type: entity # TODO: CHECK THIS IS IN THE RANDOM FOOD SPAWNER. + name: grilled cheese + parent: FoodMealBase + id: FoodMealGrilledCheese + description: Two slices of bread cooked in butter with a lofty wedge of cheese in the middle. + components: + - type: FlavorProfile + flavors: + - butter + - cheesy + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/Baked/grilledcheese.rsi + state: grilledcheese + - type: SolutionContainerManager + solutions: + food: + maxVol: 15 + reagents: + - ReagentId: Nutriment + Quantity: 6 + - ReagentId: Vitamin + Quantity: 2 + diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml index 3b080e843b4..2361ffcc6b5 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml @@ -1215,3 +1215,30 @@ - Fruit - Soup # Tastes like bungo, hot curry. + +- type: entity #TODO: CHECK THIS IS IN THE RANDOM FOOD SPAWNER. + name: scrambled eggs + parent: FoodBowlBase + id: FoodMealScrambledEggs + description: Some cooked eggs with salt. Yummy! + components: + - type: FlavorProfile + flavors: + - egg + - salty + - type: Sprite + sprite: DeltaV/Objects/Consumable/Food/scrambledeggs.rsi + layers: + - state: bowl + - state: scrambled-eggs + - type: SolutionContainerManager + solutions: + food: + maxVol: 10 + reagents: + - ReagentId: Nutriment + Quantity: 5 + - ReagentId: Protein + Quantity: 5 +# Tastes like eggs, butter and salt + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/Cartridges/Crime Assist/cartridges.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Devices/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Devices/Cartridges/Crime Assist/cartridges.yml diff --git a/Resources/Prototypes/DeltaV/cartridges/crimeassistflow.yml b/Resources/Prototypes/Entities/Objects/Devices/Cartridges/Crime Assist/crimeassistflow.yml similarity index 100% rename from Resources/Prototypes/DeltaV/cartridges/crimeassistflow.yml rename to Resources/Prototypes/Entities/Objects/Devices/Cartridges/Crime Assist/crimeassistflow.yml diff --git a/Resources/Prototypes/Entities/Objects/Devices/cartridges.yml b/Resources/Prototypes/Entities/Objects/Devices/Cartridges/cartridges.yml similarity index 100% rename from Resources/Prototypes/Entities/Objects/Devices/cartridges.yml rename to Resources/Prototypes/Entities/Objects/Devices/Cartridges/cartridges.yml 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 f6d57f53a50..f22ae43267a 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -61,3 +61,24 @@ rules: Normal syndicate antagonist rules apply. Work with whoever called you in, and don't harm them. - type: GhostRoleMobSpawner prototype: PlayerBorgSyndicateAssaultBattery + +- type: entity + parent: ReinforcementRadioSyndicate + id: ReinforcementRadioSyndicateNukieMouse + name: suspicious moldy cheese + description: Moldy cheese with a little worm sticking out of it and a... blinking antenna? Might attract an odd mouse. + components: + - type: Sprite + sprite: DeltaV/Objects/Devices/communication.rsi + layers: + - state: cheese-radio + - type: GhostRole + name: ghost-role-information-nukie-mouse-name + description: ghost-role-information-nukie-mouse-description + rules: ghost-role-information-nukie-mouse-rules + - type: GhostRoleMobSpawner + prototype: MobNukieMouse + - type: EmitSoundOnUse + sound: /Audio/Animals/mouse_squeak.ogg + - type: UseDelay + delay: 300 diff --git a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml index d270c93e50a..7653231b041 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/encryption_keys.yml @@ -249,3 +249,20 @@ layers: - state: crypt_rusted - state: pirate_label + +- type: entity + parent: EncryptionKey + id: EncryptionKeyPrison + name: Prison encryption key + description: An encryption key used by anybody who needs to speak with the prisoners + components: + - type: EncryptionKey + channels: + - Prison + defaultChannel: Prison + - type: Sprite + sprite: DeltaV/Objects/Devices/encryption_keys.rsi + layers: + - state: crypt_orange + - state: prisoner_label + diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 706cbd5dbbf..792d136490f 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -1136,3 +1136,58 @@ whitelist: components: - Cartridge + +#Delta-V - This file is licensed under AGPLv3 +# Copyright (c) 2024 Delta-V Contributors +# See AGPLv3.txt for details. + +- type: entity + parent: BasePDA + id: CorpsmanPDA + name: corpsman PDA + description: Red and Sterile. Has a built-in health analyzer. + components: + - type: Sprite + sprite: DeltaV/Objects/Devices/pda.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false + - type: CartridgeLoader # DeltaV - Crime Assist + preinstalled: + - CrewManifestCartridge + - NotekeeperCartridge + - NewsReaderCartridge + - CrimeAssistCartridge + - type: Pda + id: BrigmedicIDCard + state: pda-corpsman + - type: PdaBorderColor + borderColor: "#A32D26" + accentVColor: "#447987" + - type: Icon + sprite: DeltaV/Objects/Devices/pda.rsi + state: pda-corpsman + - type: HealthAnalyzer + scanDelay: 1 + scanningEndSound: + path: "/Audio/Items/Medical/healthscanner.ogg" + +- type: entity + parent: SyndiPDA + id: SyndiListeningPostPDA + components: + - type: Pda + id: SyndicateIDCard + state: pda-syndi-agent + penSlot: + startingItem: CyberPen + whitelist: + tags: + - Write diff --git a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml index b68257083c8..6d5ec38f2cd 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml @@ -631,3 +631,141 @@ components: - type: NavMapBeacon text: station-beacon-escape-pod + +#Command +- type: entity + parent: DefaultStationBeaconCommand + id: DefaultStationBeaconConferenceRoom + suffix: Conference Room + components: + - type: NavMapBeacon + text: station-beacon-conference-room + +#Medical +- type: entity + parent: DefaultStationBeaconMedical + id: DefaultStationBeaconVirology + suffix: Virology + components: + - type: NavMapBeacon + text: station-beacon-virology + +- type: entity + parent: DefaultStationBeaconMedical + id: DefaultStationBeaconMetempsychosis + suffix: Cloning #Metempsychosis + components: + - type: NavMapBeacon + text: station-beacon-metempsychosis + +- type: entity + parent: DefaultStationBeaconMedical + id: DefaultStationBeaconExam + suffix: Exam Room + components: + - type: NavMapBeacon + text: station-beacon-exam + +- type: entity + parent: DefaultStationBeaconMedical + id: DefaultStationBeaconMedicalOutpost + suffix: Medical Outpost + components: + - type: NavMapBeacon + text: station-beacon-med-outpost + +- type: entity + parent: DefaultStationBeaconMedical + id: DefaultStationBeaconPsychologist + suffix: Psychologist + components: + - type: NavMapBeacon + text: station-beacon-psych + +#Epistemics +- type: entity + parent: DefaultStationBeaconScience + id: DefaultStationBeaconProber + suffix: Glimmer Prober + components: + - type: NavMapBeacon + text: station-beacon-glimmer-prober + +- type: entity + parent: DefaultStationBeaconScience + id: DefaultStationBeaconMantis + suffix: Forensic Mantis + components: + - type: NavMapBeacon + text: station-beacon-forensic-mantis + +#Logistics +- type: entity + parent: DefaultStationBeaconSupply + id: DefaultStationBeaconMailroom + suffix: Mailroom + components: + - type: NavMapBeacon + text: station-beacon-mailroom + +#Engineering +- type: entity + parent: DefaultStationBeaconEngineering + id: DefaultStationBeaconEngiOutpost + suffix: Engi Outpost + components: + - type: NavMapBeacon + text: station-beacon-engi-outpost + +#Service +- type: entity + parent: DefaultStationBeaconService + id: DefaultStationBeaconJanitorsOffice + suffix: Janitor's Office + components: + - type: NavMapBeacon + text: station-beacon-janitor-office + +- type: entity + parent: DefaultStationBeaconService + id: DefaultStationBeaconReporter + suffix: Reporter + components: + - type: NavMapBeacon + text: station-beacon-reporter + +#Surveilance +- type: entity + parent: DefaultStationBeaconAI + id: DefaultStationBeaconCameraServerRoom + suffix: Camera Servers + components: + - type: NavMapBeacon + text: station-beacon-camera-servers + +#General +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconBoxing + suffix: Boxing Ring + components: + - type: NavMapBeacon + text: station-beacon-boxing-ring + +- type: entity + parent: DefaultStationBeacon + id: DefaultStationBeaconPark + suffix: Park + components: + - type: NavMapBeacon + text: station-beacon-park + +#Security +- type: entity + parent: DefaultStationBeaconSecurity + id: DefaultStationBeaconCorpsman + suffix: Corpsman + components: + - type: NavMapBeacon + text: station-beacon-corpsman + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml b/Resources/Prototypes/Entities/Objects/Fun/toy_guns.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Fun/toy_guns.yml rename to Resources/Prototypes/Entities/Objects/Fun/toy_guns.yml diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index ccb67b5ae1d..58159de289a 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1437,9 +1437,58 @@ - type: ItemToggle - type: UseDelay delay: 1 -# - type: ItemToggleActiveSound # DeltaV - No more annoying clicking +# - type: ItemToggleActiveSound # DeltaV - No more annoying clicking # TODO: CHECK THIS. UPSTREAM MERGE SHOULD'VE FIXED. # activeSound: # path: /Audio/Items/newton_cradle.ogg # params: # volume: -9 # maxDistance: 3 + +- type: entity + parent: BasePlushie + id: ToyRenault + name: renault toy + description: Almost as cute and adorable as the real Renault! + components: + - type: Sprite + sprite: DeltaV/Objects/Fun/Toys/renaulttoy.rsi + state: base + - type: EmitSoundOnUse + sound: + path: /Audio/Animals/fox_squeak.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Animals/fox_squeak.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Animals/fox_squeak.ogg + +- type: entity + parent: BasePlushie + id: ToySiobhan + name: siobhan toy + description: Nearly as fluffy as the real Shivs! + components: + - type: Sprite + sprite: DeltaV/Objects/Fun/Toys/siobhantoy.rsi + state: base + - type: EmitSoundOnUse + sound: + path: /Audio/Animals/fox_squeak.ogg + - type: EmitSoundOnTrigger + sound: + path: /Audio/Animals/fox_squeak.ogg + - type: MeleeWeapon + soundHit: + path: /Audio/Animals/fox_squeak.ogg + +- type: entity + parent: BaseFigurine + id: ToyZero + name: toy zero + description: whirrrrrrrrr taktaktaktaktak BOOM whirrrrrrr + components: + - type: Sprite + sprite: DeltaV/Objects/Fun/Toys/zerotoy.rsi + state: icon + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml b/Resources/Prototypes/Entities/Objects/Misc/first_bill.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Misc/first_bill.yml rename to Resources/Prototypes/Entities/Objects/Misc/first_bill.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml b/Resources/Prototypes/Entities/Objects/Misc/ian_dossier.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Misc/ian_dossier.yml rename to Resources/Prototypes/Entities/Objects/Misc/ian_dossier.yml diff --git a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml index 64989ccc5b3..54543723905 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/implanters.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/implanters.yml @@ -249,3 +249,12 @@ components: - type: Implanter implant: MindShieldImplant + +- type: entity + id: BionicSyrinxImplanter + name: bionic syrinx implanter + parent: BaseImplantOnlyImplanterSyndi + components: + - type: Implanter + implant: BionicSyrinxImplant + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/paperslips.yml b/Resources/Prototypes/Entities/Objects/Misc/paperslips.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Misc/paperslips.yml rename to Resources/Prototypes/Entities/Objects/Misc/paperslips.yml diff --git a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml index e88ed48fe56..91f1e818f1e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml @@ -258,3 +258,32 @@ stampState: "paper_stamp-detective" - type: Sprite state: stamp-detective + +- type: entity + name: psychologist's rubber stamp + parent: RubberStampBase + id: RubberStampPsychologist + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-psychologist + stampedColor: "#00ccff" + stampState: "paper_stamp-psychologist" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-psychologist + +- type: entity + name: lawyer's rubber stamp + parent: RubberStampBase + id: RubberStampLawyer + suffix: DO NOT MAP + components: + - type: Stamp + stampedName: stamp-component-stamped-name-lawyer + stampedColor: "#696969" + stampState: "paper_stamp-lawyer" + - type: Sprite + sprite: DeltaV/Objects/Misc/stamps.rsi + state: stamp-lawyer + diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml index dcdb316b7ec..06685c29398 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml @@ -327,3 +327,22 @@ - type: Tag tags: - MindShield + +- type: entity + parent: BaseSubdermalImplant + id: BionicSyrinxImplant + name: bionic syrinx implant + description: This implant lets a harpy adjust their voice to whoever they can think of. + noSpawn: true + components: + - type: SubdermalImplant + implantAction: ActionSyrinxChangeVoiceMask + whitelist: + components: + - HarpySinger + - type: VoiceMasker + - type: Tag + tags: + - SubdermalImplant + - BionicSyrinxImplant + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml b/Resources/Prototypes/Entities/Objects/Specific/Command/safe.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Specific/Command/safe.yml rename to Resources/Prototypes/Entities/Objects/Specific/Command/safe.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/mail.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/mail.yml rename to Resources/Prototypes/Entities/Objects/Specific/Mail/mail.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/tools.yml b/Resources/Prototypes/Entities/Objects/Specific/Mail/tools.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Specific/Mail/tools.yml rename to Resources/Prototypes/Entities/Objects/Specific/Mail/tools.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/portafib.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml rename to Resources/Prototypes/Entities/Objects/Specific/Medical/portafib.yml diff --git a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml index 953c05f107e..f0fa6e85ce8 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Service/vending_machine_restock.yml @@ -487,3 +487,30 @@ - state: green_bit shader: unshaded - state: refill_medical + +- type: entity # TODO: CHECK WHY THIS IS PARENTED TO DELTA.. + parent: BaseVendingMachineRestock + id: BaseVendingMachineRestockDeltaV + name: vending machine restock box + description: A box for restocking vending machines with corporate goodies. + abstract: true + components: + - type: Sprite + sprite: DeltaV/Objects/Specific/Service/vending_machine_restock.rsi + +- type: entity + parent: BaseVendingMachineRestockDeltaV + id: VendingMachineRestockPride + name: Pride-O-Mat restock box + description: The station needs more plushie sharks and you know it. + components: + - type: VendingMachineRestock + canRestock: + - PrideDrobeInventory + - type: Sprite + layers: + - state: base + - state: green_bit + shader: unshaded + - state: refill_pride + diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml index acfb65aa54f..b2e91196036 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml @@ -316,3 +316,35 @@ reagents: - ReagentId: Toxin Quantity: 30 + +- type: entity + id: NapalmChemistryBottle + name: napalm bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Napalm + Quantity: 30 + - type: Tag + tags: + - Bottle + +- type: entity + id: UltravasculineChemistryBottle + name: ultravasculine bottle + parent: BaseChemistryEmptyBottle + components: + - type: SolutionContainerManager + solutions: + drink: + maxVol: 30 + reagents: + - ReagentId: Ultravasculine + Quantity: 30 + - type: Tag + tags: + - Bottle diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/special.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/toy_guns.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/replicated.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/replicated.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/replicated.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/replicated.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/special.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 679acd299c4..4a71aba8cc2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -273,3 +273,93 @@ map: ["enum.GunVisualLayers.Base"] - state: mag-1 map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: BaseMagazinePistolSpecial + name: pistol magazine (.38 special) + parent: BaseItem + abstract: true + components: + - type: Tag + tags: + - MagazinePistolSpecial + - type: BallisticAmmoProvider + mayTransfer: true + whitelist: + tags: + - CartridgeSpecial + capacity: 5 + - type: Item + size: Small + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Ammunition/Magazine/Pistol/pistol_special_mag.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 6 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazinePistolSpecial + name: pistol magazine (.38 special) + parent: BaseMagazinePistolSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecial + - type: Sprite + layers: + - state: red + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazinePistolSpecialPractice + name: pistol magazine (.38 special practice) + parent: BaseMagazinePistolSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialPractice + - type: Sprite + layers: + - state: practice + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazinePistolSpecialRubber + name: pistol magazine (.38 special rubber) + parent: BaseMagazinePistolSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialRubber + - type: Sprite + layers: + - state: rubber + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + +- type: entity + id: MagazinePistolSpecialMindbreaker + name: pistol magazine (.38 special mindbreaker) + parent: BaseMagazinePistolSpecial + components: + - type: BallisticAmmoProvider + proto: CartridgeSpecialMindbreaker + - type: Sprite + layers: + - state: mindbreaker + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/replicated.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/replicated.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/replicated.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/replicated.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/special.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/SpeedLoaders/special.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 00d12606841..3f087282544 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -706,3 +706,266 @@ - type: Appearance - type: StaticPrice price: 750 + +- type: entity + name: energy gun + parent: BaseWeaponBattery + id: WeaponEnergyGun + description: "A basic hybrid energy gun with two settings: disable and kill." + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 100 + name: lethal + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + Special: { state: mode-stun } # Unused + +- type: entity + name: x-01 multiphase energy gun + parent: BaseWeaponBatterySmall + id: WeaponEnergyGunMultiphase + description: This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: Battery + maxCharge: 1000 + startingCharge: 1000 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 100 + name: lethal + state: lethal + # - proto: BulletEnergyGunIon + # fireCost: 250 + # name: ion + # state: special + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + Special: { state: mode-ion } + - type: Tag + tags: + - HighRiskItem + - Sidearm + - type: StaticPrice + price: 750 + - type: StealTarget + stealGroup: WeaponEnergyGunMultiphase + +- type: entity + name: miniature energy gun + parent: BaseWeaponBatterySmall + id: WeaponEnergyGunMini + description: A light version of the Energy gun with a smaller capacity. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: Battery + maxCharge: 500 + startingCharge: 500 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 100 + name: lethal + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + Special: { state: mode-stun } # Unused + +- type: entity + name: PDW-9 Energy Pistol + parent: BaseWeaponBatterySmall + id: WeaponEnergyGunPistol + description: A military grade sidearm, used by many militia forces throughout the local sector. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mode-disabler + shader: unshaded + map: [ "Firemode" ] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + - type: Battery + maxCharge: 800 + startingCharge: 800 + - type: ProjectileBatteryAmmoProvider + proto: BulletDisabler + fireCost: 50 + - type: EnergyGun + fireModes: + - proto: BulletDisabler + fireCost: 50 + name: disable + state: disabler + - proto: BulletEnergyGunLaser + fireCost: 100 + name: lethal + state: lethal + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + - type: GenericVisualizer + visuals: + enum.EnergyGunFireModeVisuals.State: + Firemode: + Disabler: { state: mode-disabler } + Lethal: { state: mode-lethal } + - type: Tag + tags: + - Sidearm + - type: StaticPrice + price: 750 + +- type: entity + name: IK-60 laser carbine + parent: BaseWeaponBattery + id: WeaponGunLaserCarbineAutomatic + description: "A 20 round semi-automatic laser carbine." + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-4 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + - type: Gun + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/laser.ogg + soundEmpty: + path: /Audio/DeltaV/Weapons/Guns/Empty/dry_fire.ogg + selectedMode: SemiAuto + fireRate: 3 + availableModes: + - SemiAuto + - type: Battery + maxCharge: 2000 + startingCharge: 2000 + - type: ProjectileBatteryAmmoProvider + proto: BulletEnergyGunLaser + fireCost: 100 + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: true + - type: Appearance + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 49b2eeaada1..63820af3cb0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -121,3 +121,44 @@ autoRecharge: true autoRechargeRate: 25 - type: AmmoCounter + +- type: entity + name: Experimental L6 SAW + parent: BaseItem + id: WeaponLightMachineGunL6Borg + description: A rather traditionally made LMG with a pleasantly lacquered wooden pistol grip. Uses replicated .30 rifle ammo generated internally. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/LMGs/l6.rsi + netsync: false + layers: + - state: base + map: [ "enum.GunVisualLayers.Base" ] + - type: Item + size: Huge + - type: Gun + minAngle: 4 + maxAngle: 20 + angleIncrease: 4 + angleDecay: 16 + fireRate: 5 + selectedMode: FullAuto + availableModes: + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/lmg.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/lmg_empty.ogg + - type: Battery + maxCharge: 800 + startingCharge: 500 + - type: ProjectileBatteryAmmoProvider + proto: CartridgeLightRifleReplicated + fireCost: 20 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 5 + - type: AmmoCounter +# - type: DynamicPrice +# price: 500 + - type: Appearance diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 8b31bf40ed7..a308520379a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -372,3 +372,35 @@ tags: - CartridgeRocket proto: ImmovableRodSlow + +- type: entity + name: china lake + parent: BaseWeaponLauncher + suffix: Robot, energy based + id: WeaponLauncherChinaLakeBorg + description: PLOOP! Contains a built in replicator to slowly make more ammo. + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + layers: + - state: icon + map: ["enum.GunVisualLayers.Base"] + - type: Clothing + sprite: Objects/Weapons/Guns/Launchers/china_lake.rsi + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: Battery + maxCharge: 600 + startingCharge: 300 + - type: ProjectileBatteryAmmoProvider + proto: GrenadeFrag + fireCost: 300 + - type: BatterySelfRecharger + autoRecharge: true + autoRechargeRate: 2 + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 16cacb79dfa..04673e7957e 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -262,3 +262,115 @@ whitelist: tags: - CartridgeMagnum + +- type: entity + name: viper + parent: BaseWeaponPistol + id: WeaponPistolViperWood + description: A small, low-power pistol with pleasant lacquered wooden grips. Uses .35 auto ammo. + suffix: Wood + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/viperwood.rsi + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + - MagazinePistolHighCapacity + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + +- type: entity + name: Pollock + parent: BaseWeaponPistol + id: WeaponPistolPollock + description: A compact and mass-produced combat pistol. Uses .35 auto ammo. + suffix: Mercenary + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Pistols/pollock.rsi + - type: Gun + fireRate: 5 + availableModes: + - SemiAuto + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistol + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistol + - MagazinePistolHighCapacity + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + +- type: entity + name: psi-breaker + parent: BaseWeaponPistol + id: WeaponPistolPsiBreaker + description: A small, flashy pistol with a marble style grip. Provides no tactical advantage. Uses .38 special ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Pistols/psibreaker.rsi + - type: Gun + fireRate: 3.5 + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/pistol.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolSpecialMindbreaker + insertSound: /Audio/Weapons/Guns/MagIn/pistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/pistol_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolSpecial + gun_chamber: + name: Chamber + startingItem: CartridgeSpecialMindbreaker + priority: 1 + whitelist: + tags: + - CartridgeSpecial + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml index d70b05bf61d..3a843824ea6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/impacts.yml @@ -70,3 +70,23 @@ - type: Tag tags: - HideContextMenu + +- type: entity + id: BulletImpactEffectRedDisabler + noSpawn: true + components: + - type: TimedDespawn + lifetime: 0.2 + - type: Sprite + drawdepth: Effects + layers: + - shader: unshaded + map: ["enum.EffectLayers.Unshaded"] + sprite: Objects/Weapons/Guns/Projectiles/projectiles_tg.rsi + state: impact_laser_greyscale + color: red + - type: EffectVisuals + - type: Tag + tags: + - HideContextMenu + diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml rename to Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/toy_projectiles.yml diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index bd043c997da..5f9e11b455d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -162,3 +162,132 @@ capacity: 5 chambers: [ True, True, True, True, True ] ammoSlots: [ null, null, null, null, null ] + +- type: entity + name: snubbed .45 + parent: BaseWeaponRevolver + id: WeaponRevolverSnub + description: An old and reliable revolver, modified to be more easily concealed. Uses .45 magnum ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/webleysnubnose.rsi + - type: Gun + selectedMode: SemiAuto + minAngle: 5 + maxAngle: 30 + angleIncrease: 25 + angleDecay: 5 + fireRate: 2.5 + availableModes: + - SemiAuto + - type: RevolverAmmoProvider + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + +- type: entity + name: k-38 masterpiece + parent: BaseWeaponRevolver + id: WeaponRevolverK38Master + description: A classic, if not outdated, law enforcement firearm. Uses .38 special ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/k38master.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 2 + availableModes: + - SemiAuto + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeSpecial + - SpeedLoaderSpecial + proto: CartridgeSpecialRubber + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + +- type: entity + name: fitz special + parent: BaseWeaponRevolver + id: WeaponRevolverFitz + description: A compact and concealable self defence snub revolver. Uses .38 special ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/fitz.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 1.75 + availableModes: + - SemiAuto + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeSpecial + - SpeedLoaderSpecial + proto: CartridgeSpecialRubber + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + +- type: entity + name: lucky 37 + parent: BaseWeaponRevolver + id: WeaponRevolverLucky + description: Luck always beats skill, ya weasel. Uses .38 special ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/lucky.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 2 + availableModes: + - SemiAuto + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeSpecial + - SpeedLoaderSpecial + proto: CartridgeSpecial + capacity: 6 + chambers: [ True, True, True, True, True, True ] + ammoSlots: [ null, null, null, null, null, null ] + - type: StaticPrice + price: 750 + +- type: entity + name: faith + parent: BaseWeaponRevolver + id: WeaponRevolverFaith + description: Delivers blessings in bullet form. Uses .38 special ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Revolvers/faith.rsi + - type: Gun + selectedMode: SemiAuto + fireRate: 1.5 + availableModes: + - SemiAuto + - type: RevolverAmmoProvider + whitelist: + tags: + - CartridgeSpecial + - SpeedLoaderSpecial + proto: CartridgeSpecialHoly + capacity: 4 + chambers: [ True, True, True, True ] + ammoSlots: [ null, null, null, null ] + - type: StaticPrice + price: 1500 + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 5bc8125ebaa..6da7199b83a 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -211,3 +211,180 @@ whitelist: tags: - CartridgeRifle + +- type: entity + name: Vulcan + parent: BaseWeaponRifle + id: WeaponRifleVulcan + description: One of the first firearms modified for space usage, this rifle was purpose-designed to punch holes in Cargonian "combat mechs." Uses .30 rifle ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + fireRate: 2 + selectedMode: SemiAuto + availableModes: + - SemiAuto + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineLightRifle + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/vulcan.rsi + +- type: entity + name: CAWS-25 Jackdaw + parent: BaseWeaponRifle + id: WeaponRifleJackdaw + description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo. + suffix: Deathsquad + components: + - type: Item + size: Large + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 2 + maxAngle: 6 + angleIncrease: 2 + angleDecay: 8 + fireRate: 8 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/jackdaw.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineCaselessRifle + insertSound: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/batrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineCaselessRifle + gun_chamber: + name: Chamber + startingItem: CartridgeCaselessRifle + priority: 1 + whitelist: + tags: + - CartridgeCaselessRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/jackdaw.rsi + +- type: entity + name: Tenebra + parent: BaseWeaponRifle + id: WeaponRifleTenebra + description: A mass-produced and minimalist rifle in bullpup design. Uses .20 rifle ammo. + suffix: Mercenary + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Gun + minAngle: 3 + maxAngle: 12 + angleIncrease: 3 + angleDecay: 12 + fireRate: 5 + selectedMode: FullAuto + availableModes: + - SemiAuto + - FullAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/ltrifle.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifle + insertSound: /Audio/Weapons/Guns/MagIn/ltrifle_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/ltrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + gun_chamber: + name: Chamber + startingItem: CartridgeRifle + priority: 1 + whitelist: + tags: + - CartridgeRifle + - type: ContainerContainer + containers: + gun_magazine: !type:ContainerSlot + gun_chamber: !type:ContainerSlot + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/tenebra.rsi + +- type: entity + name: M-90 + id: WeaponRifleM90 + parent: WeaponRifleM90GrenadeLauncher + description: An older bullpup carbine model. Uses .20 rifle ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Rifles/carbinenogl.rsi + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index b693bdba370..2ad637025ea 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -300,3 +300,52 @@ whitelist: tags: - CartridgeMagnum + +- type: entity + name: Typewriter + parent: BaseWeaponSubMachineGun + id: WeaponSubMachineGunTypewriter + description: A modern take on the classic design used by mobsters throughout space and time. Types .35 auto ammo. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-0 + map: ["enum.GunVisualLayers.Mag"] + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/SMGs/typewriter.rsi + - type: Gun + minAngle: 1 + maxAngle: 15 + angleIncrease: 5 + angleDecay: 20 + fireRate: 8 + soundGunshot: + path: /Audio/DeltaV/Weapons/Guns/Gunshots/typewriter.ogg + - type: ChamberMagazineAmmoProvider + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazinePistolSubMachineGun + insertSound: /Audio/Weapons/Guns/MagIn/hpistol_magin.ogg + ejectSound: /Audio/Weapons/Guns/MagOut/sfrifle_magout.ogg + priority: 2 + whitelist: + tags: + - MagazinePistolSubMachineGun + gun_chamber: + name: Chamber + startingItem: CartridgePistol + priority: 1 + whitelist: + tags: + - CartridgePistol + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index a8d9f539917..fb11d6a1aee 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -290,3 +290,50 @@ components: - type: BallisticAmmoProvider proto: ShellShotgunImprovised + +- type: entity + name: adjutant + parent: BaseWeaponShotgun + id: WeaponShotgunAdjutant + description: Sold as a "riot" shotgun, this shotgun has a special gas-operated mechanism that makes it highly effective for CQC and suppressive fire. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi + - type: Item + size: Large + - type: Gun + fireRate: 1.5 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/shotgun.ogg + soundEmpty: + path: /Audio/Weapons/Guns/Empty/empty.ogg + - type: BallisticAmmoProvider +# autoCycle: true + whitelist: + tags: + - ShellShotgun + capacity: 6 + proto: ShellShotgun + soundInsert: + path: /Audio/Weapons/Guns/MagIn/shotgun_insert.ogg + +- type: entity + name: Kammerer + parent: BaseWeaponShotgun + id: WeaponShotgunKammererNonLethal #Legacy name + description: When an old Remington design meets modern materials, this is the result. A favourite weapon of militia forces throughout many worlds. Uses .50 shotgun shells. + suffix: Beanbag + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V + - type: Clothing + sprite: DeltaV/Objects/Weapons/Guns/Shotguns/pump.rsi # Delta-V + - type: BallisticAmmoProvider + capacity: 4 + proto: ShellShotgunBeanbag + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Decoration/shuttle_manipulator.yml b/Resources/Prototypes/Entities/Structures/Decoration/shuttle_manipulator.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Structures/Decoration/shuttle_manipulator.yml rename to Resources/Prototypes/Entities/Structures/Decoration/shuttle_manipulator.yml diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index 82cdcde7c05..536459e9486 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -1310,3 +1310,18 @@ - type: AccessReader access: [["SyndicateAgent"]] +- type: entity + parent: AirlockScience + id: AirlockMantisLocked + suffix: Mantis, Locked + components: + - type: AccessReader + access: [["Mantis"]] + +- type: entity + parent: AirlockScienceGlass + id: AirlockMantisGlassLocked + suffix: Mantis, Locked + components: + - type: AccessReader + access: [["Mantis"]] diff --git a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml index 2b4b2c5fe07..c3be9359bdb 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Windoors/windoor.yml @@ -357,3 +357,28 @@ components: - type: AccessReader access: [["HeadOfPersonnel"]] + +- type: entity + parent: Windoor + id: WindoorMailLocked + suffix: Mail, Locked + components: + - type: AccessReader + access: [["Mail"]] + +- type: entity + parent: WindoorSecure + id: WindoorSecureMailLocked + suffix: Mail, Locked + components: + - type: AccessReader + access: [["Mail"]] + +- type: entity + parent: WindoorSecure + id: WindoorSecureParamedicLocked + suffix: Paramedic, Locked + components: + - type: AccessReader + access: [["Paramedic"]] + diff --git a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml index af15034257b..644df4f26bb 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/fax_machine.yml @@ -110,3 +110,21 @@ receiveNukeCodes: true - type: StealTarget stealGroup: FaxMachineCaptain + +- type: entity + parent: FaxMachineBase + id: FaxMachineListeningSyndie + name: listening post long range fax machine + suffix: Syndicate + components: + - type: Sprite + sprite: DeltaV/Structures/Machines/syndicate_fax_machine.rsi + layers: + - state: icon + map: [ "base" ] + color: "#a3a3a3" + - type: FaxMachine + name: "Unknown?" + responsePings: false + - type: Emagged + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Machines/syndicate_monitor_server.yml b/Resources/Prototypes/Entities/Structures/Machines/syndicate_monitor_server.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Structures/Machines/syndicate_monitor_server.yml rename to Resources/Prototypes/Entities/Structures/Machines/syndicate_monitor_server.yml diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 4c2217e6ff4..0a0b372f92b 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -2004,3 +2004,53 @@ - type: AccessReader access: [["SyndicateAgent"]] +- type: entity # BE GAY, DO CRIME! + parent: VendingMachine + id: VendingMachinePride + name: Pride-O-Mat + description: A vending machine containing crimes. + components: + - type: VendingMachine + pack: PrideDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + - type: Advertise + pack: PrideDrobeAds + - type: Speech + - type: Sprite + sprite: DeltaV/Structures/Machines/VendingMachines/pride.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + +- type: entity + parent: VendingMachine + id: VendingMachineCourierDrobe + name: CourierDrobe + description: Neither solar flares nor meteors nor plasma fire nor void of space stays these couriers from the swift completion of their appointed rounds. + components: + - type: VendingMachine + pack: CourierDrobeInventory + offState: off + brokenState: broken + normalState: normal-unshaded + - type: Advertise + pack: CourierDrobeAds + - type: Sprite + sprite: DeltaV/Structures/Machines/VendingMachines/courierdrobe.rsi + layers: + - state: "off" + map: ["enum.VendingMachineVisualLayers.Base"] + - state: "off" + map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] + shader: unshaded + - state: panel + map: ["enum.WiresVisualLayers.MaintenancePanel"] + - type: AccessReader + access: [["Mail"]] diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml index a644c7afa14..0e0f98d5593 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml @@ -211,3 +211,24 @@ - type: ExaminableSolution solution: tank +# Kvass +- type: entity + id: KvassTank + parent: StorageTank + suffix: Empty + components: + - type: Sprite + sprite: DeltaV/Structures/Storage/kvass.rsi + state: kvass + +- type: entity + parent: KvassTank + id: KvassTankFull + suffix: Full + components: + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: Kvass + Quantity: 1500 diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 1953ecd146d..4075e884657 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -1160,3 +1160,24 @@ components: - type: Sprite state: originmap + +- type: entity + parent: PosterBase + id: PosterLegitFuckAround + name: Fuck Around... + description: ...and find out. Sponsored by the Intergalactic Bartenders' Federation, Delta branch. + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/Posters/TJohnson.rsi + state: fuckaround + +- type: entity + parent: PosterBase + id: PosterContrabandGotWood + name: "Got Wood?" + description: "A grimy old advert for a seedy lumber company. \"You got a friend in me.\" is scrawled in the corner." + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/Posters/misc.rsi + state: woodygotwood + diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index ceb9f94b580..b58074f8648 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1404,3 +1404,24 @@ components: - type: Sprite state: ntmining + +- type: entity + parent: BaseSignDirectional + id: SignDirectionalLogistics # THIS NEEDS TO REPLACE THE CARGO SIGN OUTRIGHT. DELETE CARGO SIGN. + name: logistics sign + description: A direction sign, pointing out which way the Logistics department is. + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi + state: direction_logi + +- type: entity + parent: BaseSignDirectional + id: SignDirectionalMail + name: mailroom sign + description: A direction sign, pointing out which way the mailroom is. + components: + - type: Sprite + sprite: DeltaV/Structures/Wallmounts/signs.rsi + state: direction_mail + diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/paintings.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/paintings.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Structures/Wallmounts/paintings.yml rename to Resources/Prototypes/Entities/Structures/Wallmounts/paintings.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml b/Resources/Prototypes/Entities/Structures/Walls/mountain.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Structures/Walls/mountain.yml rename to Resources/Prototypes/Entities/Structures/Walls/mountain.yml diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml b/Resources/Prototypes/Entities/Structures/Windows/tinted_windows.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Entities/Structures/Windows/tinted_windows.yml rename to Resources/Prototypes/Entities/Structures/Windows/tinted_windows.yml diff --git a/Resources/Prototypes/Entities/Structures/cryopod.yml b/Resources/Prototypes/Entities/Structures/cryopod.yml index 9063e8b1385..5bc0bbb7a2e 100644 --- a/Resources/Prototypes/Entities/Structures/cryopod.yml +++ b/Resources/Prototypes/Entities/Structures/cryopod.yml @@ -61,3 +61,14 @@ - type: ContainerSpawnPoint containerId: storage spawnType: LateJoin + +- type: entity + parent: CryogenicSleepUnit + id: CryogenicSleepUnitSpawnerPrisoner + suffix: Spawner, Prisoner + components: + - type: ContainerSpawnPoint + containerId: storage + spawnType: Job + job: Prisoner + diff --git a/Resources/Prototypes/Flavors/flavors.yml b/Resources/Prototypes/Flavors/flavors.yml index ed231e224bf..6b638cda5bc 100644 --- a/Resources/Prototypes/Flavors/flavors.yml +++ b/Resources/Prototypes/Flavors/flavors.yml @@ -1013,3 +1013,122 @@ id: violets flavorType: Complex description: flavor-complex-violets + +#Nyano + +- type: flavor + id: enthralling + flavorType: Complex + description: flavor-complex-enthralling + +- type: flavor + id: sublime + flavorType: Complex + description: flavor-complex-sublime + +- type: flavor + id: holy + flavorType: Complex + description: flavor-complex-holy + +- type: flavor + id: seeds + flavorType: Base + description: flavor-base-seeds + +- type: flavor + id: cotton + flavorType: Complex + description: flavor-complex-cotton + +- type: flavor + id: vanilla + flavorType: Complex + description: flavor-complex-vanilla + +- type: flavor + id: soju + flavorType: Complex + description: flavor-complex-soju + +- type: flavor + id: orangecreamcicle + flavorType: Complex + description: flavor-complex-orangecreamcicle + +- type: flavor + id: silverjack + flavorType: Complex + description: flavor-complex-silverjack + +- type: flavor + id: brainbomb + flavorType: Complex + description: flavor-complex-brainbomb + +- type: flavor + id: atomicpunch + flavorType: Complex + description: flavor-complex-atomicpunch + +- type: flavor + id: circusjuice + flavorType: Complex + description: flavor-complex-circusjuice + +- type: flavor + id: pinkdrink + flavorType: Complex + description: flavor-complex-pinkdrink + +- type: flavor + id: sapopicante + flavorType: Complex + description: flavor-complex-sapopicante + +- type: flavor + id: graveyard + flavorType: Complex + description: flavor-complex-graveyard + +- type: flavor + id: bubbletea + flavorType: Complex + description: flavor-complex-bubbletea + +- type: flavor + id: corncob + flavorType: Complex + description: flavor-complex-corncob + +#Delta V +- type: flavor + id: dulleavene + flavorType: Complex + description: flavor-complex-dulleavene + +- type: flavor + id: gunmetal + flavorType: Complex + description: flavor-complex-gunmetal + +- type: flavor + id: lemondrop + flavorType: Complex + description: flavor-complex-lemondrop + +- type: flavor + id: greengrass + flavorType: Complex + description: flavor-complex-greengrass + +- type: flavor + id: daiquiri + flavorType: Complex + description: flavor-complex-daiquiri + +- type: flavor + id: arsonistsbrew + flavorType: Complex + description: flavor-complex-arsonistsbrew + diff --git a/Resources/Prototypes/GameRules/events.yml b/Resources/Prototypes/GameRules/events.yml index db99266cbaa..8d6e593fb03 100644 --- a/Resources/Prototypes/GameRules/events.yml +++ b/Resources/Prototypes/GameRules/events.yml @@ -478,3 +478,68 @@ minimumPlayers: 20 weight: 5 - type: MobReplacementRule + +- type: entity + id: XenoVents + parent: BaseGameRule + noSpawn: true + components: + - type: StationEvent + startAnnouncement: station-event-xeno-vent-start-announcement + startAudio: + path: /Audio/Announcements/aliens.ogg + earliestStart: 20 + minimumPlayers: 15 + weight: 1 + duration: 60 + - type: VentCrittersRule + entries: + - id: MobXeno + prob: 0.01 + - id: MobXenoRouny + prob: 0.005 + - id: MobXenoDrone + prob: 0.005 + - id: MobXenoSpitter + prob: 0.005 + - id: MobXenoRunner + prob: 0.005 + - id: MobXenoPraetorian + prob: 0.005 + - id: MobXenoRavager + prob: 0.005 + - id: MobXenoQueen + prob: 0.005 + +- type: entity + id: MothroachSpawn + parent: BaseGameRule + noSpawn: true + components: + - type: StationEvent + id: VentCritters + earliestStart: 15 + minimumPlayers: 15 + weight: 4 + duration: 60 + - type: VentCrittersRule + entries: + - id: MobMothroach + prob: 0.05 + +- type: entity # Delta-V : Midround Syndie Listening Station Spawn + id: PirateRadioSpawn + parent: BaseGameRule + noSpawn: true + components: + - type: StationEvent + earliestStart: 15 + weight: 5 + minimumPlayers: 25 + maxOccurrences: 1 + duration: 1 + - type: PirateRadioSpawnRule + debrisCount: 6 + distanceModifier: 13 + debrisDistanceModifier: 3 + diff --git a/Resources/Prototypes/GameRules/midround.yml b/Resources/Prototypes/GameRules/midround.yml index 37fc4b44cde..6ced2252d9f 100644 --- a/Resources/Prototypes/GameRules/midround.yml +++ b/Resources/Prototypes/GameRules/midround.yml @@ -45,3 +45,16 @@ objectives: - TerminateObjective - ShutDownObjective + +- type: entity + noSpawn: true + parent: BaseGameRule + id: ParadoxAnomaly + components: + - type: GenericAntagRule + agentName: paradox-anomaly-round-end-agent-name + objectives: + - ParadoxAnomalyKillObjective + - ParadoxAnomalyFriendObjective + - ParadoxAnomalyEscapeObjective + diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml similarity index 100% rename from Resources/Prototypes/DeltaV/InventoryTemplates/digitigrade_inventory_template.yml rename to Resources/Prototypes/InventoryTemplates/digitigrade_inventory_template.yml diff --git a/Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/secdog_inventory_template.yml similarity index 100% rename from Resources/Prototypes/DeltaV/InventoryTemplates/secdog_inventory_template.yml rename to Resources/Prototypes/InventoryTemplates/secdog_inventory_template.yml diff --git a/Resources/Prototypes/Maps/salvage.yml b/Resources/Prototypes/Maps/salvage.yml index a191fec6b85..712785a5221 100644 --- a/Resources/Prototypes/Maps/salvage.yml +++ b/Resources/Prototypes/Maps/salvage.yml @@ -1,141 +1,135 @@ -# Dear god please stop adding ones with thousands of entities, learn how procgen works. - -# "Small"-class maps - Max size square: 7x7, indicated size: 3.5 - -- type: salvageMap - id: Small1 - mapPath: /Maps/Salvage/small-1.yml - -- type: salvageMap - id: Small2 - mapPath: /Maps/Salvage/small-2.yml - -- type: salvageMap - id: SmallShip1 - mapPath: /Maps/Salvage/small-ship-1.yml - -- type: salvageMap - id: Small3 - mapPath: /Maps/Salvage/small-3.yml +# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5 - type: salvageMap - id: SmallAISurveyDrone - mapPath: /Maps/Salvage/small-ai-survey-drone.yml + id: DVOutpostArm + mapPath: /Maps/Salvage/DeltaV/DV-outpost-arm.yml + size: medium - type: salvageMap - id: Small4 - mapPath: /Maps/Salvage/small-4.yml + id: DVMedium1 + mapPath: /Maps/Salvage/DeltaV/DV-medium-01.yml + size: medium - type: salvageMap - id: SmallCargo - mapPath: /Maps/Salvage/small-cargo.yml + id: DVMediumVault1 + mapPath: /Maps/Salvage/DeltaV/DV-med-vault-01.yml + size: medium - type: salvageMap - id: SmallChapel - mapPath: /Maps/Salvage/small-chapel.yml + id: DVMediumOrchestra + mapPath: /Maps/Salvage/DeltaV/DV-med-silent-orchestra.yml + size: medium - type: salvageMap - id: SmallChef - mapPath: /Maps/Salvage/small-chef.yml + id: DVMediumLibraryWreck + mapPath: /Maps/Salvage/DeltaV/DV-med-library.yml + size: medium - type: salvageMap - id: SmallParty - mapPath: /Maps/Salvage/small-party.yml + id: DVMediumCargoWreck + mapPath: /Maps/Salvage/DeltaV/DV-cargo-01.yml + size: medium - type: salvageMap - id: SmallSyndicate - mapPath: /Maps/Salvage/small-syndicate.yml + id: DVMediumPirateWreck + mapPath: /Maps/Salvage/DeltaV/DV-med-pirate.yml + size: medium - type: salvageMap - id: SmallTesla - mapPath: /Maps/Salvage/small-tesla.yml - -# Small - Asteroids + id: DVTickColony + mapPath: /Maps/Salvage/DeltaV/DV-tick-colony.yml + size: medium - type: salvageMap - id: SmallA1 - mapPath: /Maps/Salvage/small-a-1.yml - -# "Medium"-class maps - Max size square: 15x15, indicated size: 7.5 + id: DVCargoDock + mapPath: /Maps/Salvage/DeltaV/DV-med-dock.yml + size: medium - type: salvageMap - id: Medium1 - mapPath: /Maps/Salvage/medium-1.yml + id: DVSpaceWaffleHome + mapPath: /Maps/Salvage/DeltaV/DV-wh-salvage.yml + size: medium - type: salvageMap - id: MediumVault1 - mapPath: /Maps/Salvage/medium-vault-1.yml + id: DVMediumShuttleWreck + mapPath: /Maps/Salvage/DeltaV/DV-med-ruined-emergency-shuttle.yml + size: medium - type: salvageMap - id: MediumOrchestra - mapPath: /Maps/Salvage/medium-silent-orchestra.yml + id: DVmediumPetHospital + mapPath: /Maps/Salvage/DeltaV/DV-med-pet-hospital.yml + size: medium - type: salvageMap - id: MediumLibraryWreck - mapPath: /Maps/Salvage/medium-library.yml + id: DVMediumCrashedShuttle + mapPath: /Maps/Salvage/DeltaV/DV-med-crashed-shuttle.yml + size: medium - type: salvageMap - id: MediumCargoWreck - mapPath: /Maps/Salvage/cargo-1.yml + id: DVMeatball + mapPath: /Maps/Salvage/DeltaV/DV-meatball.yml + size: medium - type: salvageMap - id: MediumPirateWreck - mapPath: /Maps/Salvage/medium-pirate.yml + id: DVMediumHaulingShuttleWreck + mapPath: /Maps/Salvage/DeltaV/DV-hauling-shuttle.yml + size: medium - type: salvageMap - id: TickColony - mapPath: /Maps/Salvage/tick-colony.yml + id: AsteroidSyndiHideout + mapPath: /Maps/Salvage/DeltaV/DV-syndi-hideout.yml + size: medium -- type: salvageMap - id: CargoDock - mapPath: /Maps/Salvage/medium-dock.yml +# """Large""" maps - type: salvageMap - id: SpaceWaffleHome - mapPath: /Maps/Salvage/wh-salvage.yml + id: DVStationStation + mapPath: /Maps/Salvage/DeltaV/DV-stationstation.yml + size: large - type: salvageMap - id: MediumShuttleWreck - mapPath: /Maps/Salvage/medium-ruined-emergency-shuttle.yml + id: DVAsteroidBase + mapPath: /Maps/Salvage/DeltaV/DV-asteroid-base.yml + size: large - type: salvageMap - id: MediumPetHospital - mapPath: /Maps/Salvage/medium-pet-hospital.yml + id: DVRuinCargoBase + mapPath: /Maps/Salvage/DeltaV/DV-ruin-cargo-salvage.yml + size: large - type: salvageMap - id: MediumCrashedShuttle - mapPath: /Maps/Salvage/medium-crashed-shuttle.yml + id: DVSecurityChunk + mapPath: /Maps/Salvage/DeltaV/DV-security-chunk.yml + size: large - type: salvageMap - id: Meatball - mapPath: /Maps/Salvage/meatball.yml + id: AsteroidChemlab + mapPath: /Maps/Salvage/DeltaV/DV-asteroid-mining-chemlab.yml + size: large - type: salvageMap - id: MediumHaulingShuttleWreck - mapPath: /Maps/Salvage/hauling-shuttle.yml - -# """Large""" maps + id: LaundromatChunk + mapPath: /Maps/Salvage/DeltaV/DV-laundromat-chunk.yml + size: large -- type: salvageMap - id: StationStation - mapPath: /Maps/Salvage/stationstation.yml + # Asteroids - type: salvageMap - id: AsteroidBase - mapPath: /Maps/Salvage/asteroid-base.yml + id: AsteroidTickNest + mapPath: /Maps/Salvage/DeltaV/DV-tick-nest.yml - type: salvageMap - id: RuinCargoBase - mapPath: /Maps/Salvage/ruin-cargo-salvage.yml + id: AsteroidMiningMed1 + mapPath: /Maps/Salvage/DeltaV/DV-large-asteroid-mining-01.yml - type: salvageMap - id: SecurityChunk - mapPath: /Maps/Salvage/security-chunk.yml + id: AsteroidMiningLarge1 + mapPath: /Maps/Salvage/DeltaV/DV-med-asteroid-mining-01.yml - type: salvageMap - id: EngineeringChunk - mapPath: /Maps/Salvage/engineering-chunk.yml + id: AsteroidCrystalCave + mapPath: /Maps/Salvage/DeltaV/DV-crystal-cave.yml - type: salvageMap - id: OutpostArm - mapPath: /Maps/Salvage/outpost-arm.yml + id: AsteroidBoneCave + mapPath: /Maps/Salvage/DeltaV/DV-bone-cave.yml diff --git a/Resources/Prototypes/DeltaV/NPC/roboisseur.yml b/Resources/Prototypes/NPCs/roboisseur.yml similarity index 100% rename from Resources/Prototypes/DeltaV/NPC/roboisseur.yml rename to Resources/Prototypes/NPCs/roboisseur.yml diff --git a/Resources/Prototypes/DeltaV/Objectives/paradox_anomaly.yml b/Resources/Prototypes/Objectives/paradox_anomaly.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Objectives/paradox_anomaly.yml rename to Resources/Prototypes/Objectives/paradox_anomaly.yml diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml index d2a9690ae20..805ba93ca13 100644 --- a/Resources/Prototypes/Objectives/stealTargetGroups.yml +++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml @@ -420,3 +420,24 @@ sprite: sprite: Mobs/Animals/crab.rsi state: crab + +- type: stealTargetGroup + id: SpaceCashLuckyBill + name: logistics officer's lucky bill + sprite: + sprite: DeltaV/Objects/Misc/first_bill.rsi + state: icon + +- type: stealTargetGroup + id: BookIanDossier + name: head of personnel's photobook + sprite: + sprite: DeltaV/Objects/Misc/bureaucracy.rsi + state: folder-hop-ian + +- type: stealTargetGroup + id: WeaponEnergyGunMultiphase + name: x-01 multiphase energy gun + sprite: + sprite: DeltaV/Objects/Weapons/Guns/Battery/multiphase_energygun.rsi + state: base diff --git a/Resources/Prototypes/Objectives/traitor.yml b/Resources/Prototypes/Objectives/traitor.yml index ffeba32546d..f627a8d7869 100644 --- a/Resources/Prototypes/Objectives/traitor.yml +++ b/Resources/Prototypes/Objectives/traitor.yml @@ -49,38 +49,38 @@ state: shuttle - type: EscapeShuttleCondition -##- type: entity # DeltaV -# noSpawn: true -# parent: BaseTraitorObjective -# id: DieObjective -# name: Die a glorious death -# description: Die. -# components: -# - type: Objective -# difficulty: 0.5 -# icon: -# sprite: Mobs/Ghosts/ghost_human.rsi -# state: icon -# - type: ObjectiveBlacklistRequirement -# blacklist: -# components: -# - EscapeShuttleCondition -# - StealCondition -# - type: DieCondition - -#- type: entity -# noSpawn: true -# parent: [BaseTraitorObjective, BaseLivingObjective] -# id: HijackShuttleObjective -# name: Hijack emergency shuttle -# description: Leave on the shuttle free and clear of the loyal Nanotrasen crew on board. Use ANY methods available to you. Syndicate agents, Nanotrasen enemies, and handcuffed hostages may remain alive on the shuttle. Ignore assistance from anyone other than a support agent. -# components: -# - type: Objective -# difficulty: 5 # insane, default config max difficulty -# icon: -# sprite: Objects/Tools/emag.rsi -# state: icon -# - type: HijackShuttleCondition +- type: entity + noSpawn: true + parent: BaseTraitorObjective + id: DieObjective + name: Die a glorious death + description: Die. + components: + - type: Objective + difficulty: 0.5 + icon: + sprite: Mobs/Ghosts/ghost_human.rsi + state: icon + - type: ObjectiveBlacklistRequirement + blacklist: + components: + - EscapeShuttleCondition + - StealCondition + - type: DieCondition + +- type: entity + noSpawn: true + parent: [BaseTraitorObjective, BaseLivingObjective] + id: HijackShuttleObjective + name: Hijack emergency shuttle + description: Leave on the shuttle free and clear of the loyal Nanotrasen crew on board. Use ANY methods available to you. Syndicate agents, Nanotrasen enemies, and handcuffed hostages may remain alive on the shuttle. Ignore assistance from anyone other than a support agent. + components: + - type: Objective + difficulty: 5 # insane, default config max difficulty + icon: + sprite: Objects/Tools/emag.rsi + state: icon + - type: HijackShuttleCondition # kill @@ -309,3 +309,38 @@ - type: StealCondition stealGroup: NukeDisk owner: objective-condition-steal-station + +- type: entity # Logistics Officer steal objective. + noSpawn: true + parent: BaseTraitorStealObjective + id: LOLuckyBillStealObjective + components: + - type: NotJobRequirement + job: Quartermaster + - type: StealCondition + stealGroup: SpaceCashLuckyBill + # owner: job-name-qm + +- type: entity # Head of Personnel steal objective. + noSpawn: true + parent: BaseTraitorStealObjective + id: HoPBookIanDossierStealObjective + components: + - type: NotJobRequirement + job: HeadOfPersonnel + - type: StealCondition + stealGroup: BookIanDossier + # owner: job-name-hop + +- type: entity # Head of Security steal objective. + noSpawn: true + parent: BaseTraitorStealObjective + id: HoSGunStealObjective + components: + - type: Objective + difficulty: 3 # HoS will mostly be using the gun to stop you from stealing it + - type: NotJobRequirement + job: HeadOfSecurity + - type: StealCondition + stealGroup: WeaponEnergyGunMultiphase + owner: job-name-hos diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 946a2a6e449..11ec0829907 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml @@ -472,3 +472,190 @@ effects: - !type:SatiateThirst factor: 0.6 + +- type: reagent + id: HealthViolation + name: reagent-name-healthviolation + parent: BaseDrink + desc: reagent-desc-healthviolation + physicalDesc: reagent-physical-desc-strong-smelling + flavor: dulleavene + color: "#ff7f00" + metamorphicSprite: + sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.3 + - !type:PopupMessage + conditions: + - !type:ReagentThreshold + min: 30 + type: Local + visualType: Medium + messages: [ "generic-reagent-effect-damnation" ] + probability: 0.2 + - !type:ChemVomit + conditions: + - !type:ReagentThreshold + min: 30 + probability: 0.02 + +- type: reagent + id: Gunmetal #Credit to DinkusMcsplinkus for inspiring this drink. This could've also been called "Creamy Ignition" + name: reagent-name-gunmetal + parent: BaseDrink + desc: reagent-desc-gunmetal + physicalDesc: reagent-physical-desc-strong-smelling + flavor: gunmetal + color: "#994422" + metamorphicSprite: + sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.20 + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 0.5 + +- type: reagent + id: LemonDrop + name: reagent-name-lemondrop + parent: BaseDrink + desc: reagent-desc-lemondrop + physicalDesc: reagent-physical-desc-lemony-fresh + flavor: lemondrop + color: "#fff789" + metamorphicSprite: + sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.15 + +- type: reagent + id: GreenGrass + name: reagent-name-greengrass + parent: BaseDrink + desc: reagent-desc-greengrass + physicalDesc: reagent-physical-desc-tangy + flavor: greengrass + color: "#66aa55" + metamorphicSprite: + sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.05 + +- type: reagent + id: Daiquiri + name: reagent-name-daiquiri + parent: BaseDrink + desc: reagent-desc-daiquiri + physicalDesc: reagent-physical-desc-tart + flavor: daiquiri + color: "#ddffdd" + metamorphicSprite: + sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + +- type: reagent + id: ArsonistsBrew + name: reagent-name-arsonistsbrew + parent: BaseDrink + desc: reagent-desc-arsonistsbrew + physicalDesc: reagent-physical-desc-volatile + flavor: arsonistsbrew + color: "#fff789" + metamorphicSprite: + sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.30 + Poison: + effects: + - !type:HealthChange + damage: + types: + Heat: 2 + - !type:FlammableReaction + multiplier: 0.5 + - !type:Ignite + - !type:Emote + emote: Laugh + probability: 0.25 + +- type: reagent + id: Kvass + name: reagent-name-kvass + parent: BaseDrink + desc: reagent-desc-kvass + physicalDesc: reagent-physical-desc-bubbly + flavor: bread + color: "#381600" + metamorphicSprite: + sprite: Objects/Consumable/Drinks/kvass.rsi + state: icon + +- type: reagent + id: Mothamphetamine + name: reagent-name-mothamphetamine + parent: BaseDrink + desc: reagent-desc-mothamphetamine + physicalDesc: reagent-physical-desc-fuzzy + flavor: cotton + color: "#2fa1ef" + metamorphicSprite: + sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi + state: icon + metabolisms: + Drink: + effects: + - !type:SatiateThirst + factor: 2 + - !type:AdjustReagent + reagent: Ethanol + amount: 0.25 + Poison: + effects: + - !type:Jitter + diff --git a/Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/prescription_huds.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/prescription_huds.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Recipes/Construction/Graphs/clothing/prescription_huds.yml rename to Resources/Prototypes/Recipes/Construction/Graphs/clothing/prescription_huds.yml diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index 4fe2c474bb4..f81c2fd435e 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -1,24 +1,24 @@ -# - type: construction # DeltaV - Prevent clowns from making the hardsuit -# name: clown hardsuit -# id: ClownHardsuit -# graph: ClownHardsuit -# startNode: start -# targetNode: clownHardsuit -# category: construction-category-clothing -# description: A modified hardsuit fit for a clown. -# icon: { sprite: Clothing/OuterClothing/Hardsuits/clown.rsi, state: icon } -# objectType: Item +- type: construction + name: clown hardsuit + id: ClownHardsuit + graph: ClownHardsuit + startNode: start + targetNode: clownHardsuit + category: construction-category-clothing + description: A modified hardsuit fit for a clown. + icon: { sprite: Clothing/OuterClothing/Hardsuits/clown.rsi, state: icon } + objectType: Item -#- type: construction # DeltaV - No mimes either -# name: mime hardsuit -# id: MimeHardsuit -# graph: MimeHardsuit -# startNode: start -# targetNode: mimeHardsuit -# category: construction-category-clothing -# description: A modified hardsuit fit for a mime. -# icon: { sprite: Clothing/OuterClothing/Hardsuits/mime.rsi, state: icon } -# objectType: Item +- type: construction + name: mime hardsuit + id: MimeHardsuit + graph: MimeHardsuit + startNode: start + targetNode: mimeHardsuit + category: construction-category-clothing + description: A modified hardsuit fit for a mime. + icon: { sprite: Clothing/OuterClothing/Hardsuits/mime.rsi, state: icon } + objectType: Item - type: construction name: bone armor @@ -85,3 +85,26 @@ description: Two huds joined by arms icon: { sprite: Clothing/Eyes/Hud/medsec.rsi, state: icon } objectType: Item + +# TODO: Move Textures +- type: construction + name: prescription medhud + id: ClothingEyesPrescriptionMedHud + graph: PrescriptionMedHud + startNode: start + targetNode: prescmedhud + category: construction-category-clothing + description: Prescription medhud, merged glasses and medhud together by sheer luck and cables with glue. + icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi, state: icon } + objectType: Item + +- type: construction + name: prescription sechud + id: ClothingEyesPrescriptionHudSecurity + graph: PrescriptionSecHud + startNode: start + targetNode: prescsechud + category: construction-category-clothing + description: Prescription sechud, merged glasses and sechud together by sheer luck and cables with glue. + icon: { sprite: DeltaV/Clothing/Eyes/Hud/prescsechud.rsi, state: icon } + objectType: Item diff --git a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml index a5620fd8efe..109707d6c97 100644 --- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml +++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml @@ -1951,3 +1951,35 @@ FoodTomato: 1 FoodCabbage: 1 FoodOnionSlice: 2 + +- type: microwaveMealRecipe + id: RecipeGrilledCheese + name: grilled cheese + result: FoodMealGrilledCheese + time: 10 + solids: + FoodBreadPlainSlice: 2 + FoodCheeseSlice: 1 + FoodButter: 1 + +- type: microwaveMealRecipe + id: RecipeScrambledEggs + name: scrambled eggs recipe + result: FoodMealScrambledEggs + time: 5 + reagents: + TableSalt: 5 + solids: + FoodBowlBig: 1 + FoodEgg: 3 + FoodButter: 1 + +- type: microwaveMealRecipe + id: RecipePumpkinPie + name: pumpkin pie + result: FoodPiePumpkin + time: 15 + solids: + FoodDoughPie: 1 + FoodPumpkin: 1 + FoodPlateTin: 1 diff --git a/Resources/Prototypes/Recipes/Lathes/clothing.yml b/Resources/Prototypes/Recipes/Lathes/clothing.yml index 626ec82a914..d09fbb2d4b7 100644 --- a/Resources/Prototypes/Recipes/Lathes/clothing.yml +++ b/Resources/Prototypes/Recipes/Lathes/clothing.yml @@ -325,6 +325,13 @@ Cloth: 300 Durathread: 100 +- type: latheRecipe + id: ClothingUniformJumpskirtHoSBlue + result: ClothingUniformJumpskirtHoSBlue + completetime: 4 + materials: + Cloth: 300 + - type: latheRecipe id: ClothingUniformJumpsuitHoSGrey result: ClothingUniformJumpsuitHoSGrey @@ -333,6 +340,14 @@ Cloth: 300 Durathread: 100 +- type: latheRecipe + id: ClothingUniformJumpskirtHoSGrey + result: ClothingUniformJumpskirtHoSGrey + completetime: 4 + materials: + Cloth: 300 + + - type: latheRecipe id: ClothingUniformJumpskirtHoSAlt result: ClothingUniformJumpskirtHoSAlt @@ -546,6 +561,69 @@ materials: Cloth: 300 +- type: latheRecipe + id: ClothingUniformJumpsuitSecBlue + result: ClothingUniformJumpsuitSecBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtSecBlue + result: ClothingUniformJumpskirtSecBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitSecGrey + result: ClothingUniformJumpsuitSecGrey + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtSecGrey + result: ClothingUniformJumpskirtSecGrey + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitWardenBlue + result: ClothingUniformJumpsuitWardenBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtWardenBlue + result: ClothingUniformJumpskirtWardenBlue + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpsuitWardenGrey + result: ClothingUniformJumpsuitWardenGrey + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingUniformJumpskirtWardenGrey + result: ClothingUniformJumpskirtWardenGrey + completetime: 4 + materials: + Cloth: 300 + +- type: latheRecipe + id: ClothingOuterStasecSweater + result: ClothingOuterStasecSweater + completetime: 4 + materials: + Cloth: 500 + - type: latheRecipe id: ClothingUniformJumpsuitBrigmedic result: ClothingUniformJumpsuitBrigmedic diff --git a/Resources/Prototypes/Recipes/Lathes/electronics.yml b/Resources/Prototypes/Recipes/Lathes/electronics.yml index f0c59a0bdf9..e2e31b2bf7b 100644 --- a/Resources/Prototypes/Recipes/Lathes/electronics.yml +++ b/Resources/Prototypes/Recipes/Lathes/electronics.yml @@ -921,7 +921,7 @@ materials: Steel: 100 Glass: 900 - + - type: latheRecipe id: ShuttleGunPerforatorCircuitboard result: ShuttleGunPerforatorCircuitboard @@ -930,7 +930,7 @@ Steel: 100 Glass: 900 Gold: 100 - + - type: latheRecipe id: ShuttleGunKineticCircuitboard result: ShuttleGunKineticCircuitboard @@ -938,7 +938,7 @@ materials: Steel: 100 Glass: 900 - + - type: latheRecipe id: ShuttleGunFriendshipCircuitboard result: ShuttleGunFriendshipCircuitboard @@ -947,7 +947,7 @@ Steel: 100 Glass: 900 Gold: 50 - + - type: latheRecipe id: ShuttleGunDusterCircuitboard result: ShuttleGunDusterCircuitboard @@ -956,3 +956,12 @@ Steel: 100 Glass: 900 Gold: 100 + +- type: latheRecipe + id: SalvageExpeditionsComputerCircuitboard + result: SalvageExpeditionsComputerCircuitboard + completetime: 4 + materials: + Steel: 100 + Glass: 900 + Silver: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index ffa74d460f9..f7280304cc0 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -612,7 +612,7 @@ Steel: 1000 Glass: 500 Plastic: 500 - + - type: latheRecipe id: MagazineGrenadeEmpty result: MagazineGrenadeEmpty @@ -620,7 +620,7 @@ materials: Steel: 150 Plastic: 50 - + - type: latheRecipe id: GrenadeEMP result: GrenadeEMP @@ -629,7 +629,7 @@ Steel: 150 Plastic: 100 Glass: 20 - + - type: latheRecipe id: GrenadeBlast result: GrenadeBlast @@ -638,7 +638,7 @@ Steel: 150 Plastic: 100 Gold: 50 - + - type: latheRecipe id: GrenadeFlash result: GrenadeFlash @@ -647,4 +647,184 @@ Steel: 150 Plastic: 100 Glass: 20 - \ No newline at end of file + +- type: latheRecipe + id: SpeedLoaderSpecial + result: SpeedLoaderSpecial + category: Ammo + completetime: 5 + materials: + Steel: 200 + +- type: latheRecipe + id: MagazinePistolSpecial + result: MagazinePistolSpecial + category: Ammo + completetime: 5 + materials: + Steel: 100 + +- type: latheRecipe + id: CartridgeSpecial + result: CartridgeSpecial + category: Ammo + completetime: 2 + materials: + Steel: 20 + +- type: latheRecipe + id: CartridgeSpecialRubber + result: CartridgeSpecialRubber + category: Ammo + completetime: 2 + materials: + Plastic: 5 + Steel: 5 + +- type: latheRecipe + id: CartridgeSpecialIncendiary + result: CartridgeSpecialIncendiary + category: Ammo + completetime: 2 + materials: + Plastic: 20 + +- type: latheRecipe + id: CartridgeSpecialUranium + result: CartridgeSpecialUranium + category: Ammo + completetime: 2 + materials: + Plastic: 20 + Uranium: 10 + +- type: latheRecipe + id: CartridgeSpecialHoly + result: CartridgeSpecialHoly + category: Ammo + completetime: 2 + materials: + Steel: 15 + Silver: 5 + +- type: latheRecipe + id: CartridgeSpecialMindbreaker + result: CartridgeSpecialMindbreaker + category: Ammo + completetime: 2 + materials: + Plastic: 15 + Steel: 5 + Bluespace: 5 + +- type: latheRecipe + id: MagazineBoxSpecial + result: MagazineBoxSpecial + category: Ammo + completetime: 5 + materials: + Steel: 1250 + +- type: latheRecipe + id: MagazineBoxSpecialPractice + result: MagazineBoxSpecialPractice + category: Ammo + completetime: 5 + materials: + Plastic: 1200 + +- type: latheRecipe + id: MagazineBoxSpecialRubber + result: MagazineBoxSpecialRubber + category: Ammo + completetime: 5 + materials: + Steel: 350 + Plastic: 300 + +- type: latheRecipe + id: MagazineBoxSpecialIncendiary + result: MagazineBoxSpecialIncendiary + category: Ammo + completetime: 5 + materials: + Plastic: 1250 + +- type: latheRecipe + id: MagazineBoxSpecialUranium + result: MagazineBoxSpecialUranium + category: Ammo + completetime: 5 + materials: + Plastic: 1250 + Uranium: 125 + +- type: latheRecipe + id: MagazineBoxSpecialMindbreaker + result: MagazineBoxSpecialMindbreaker + category: Ammo + completetime: 5 + materials: + Plastic: 1250 + Steel: 75 + Bluespace: 75 + +- type: latheRecipe + id: ClothingOuterArmorPlateCarrier + result: ClothingOuterArmorPlateCarrier + completetime: 10 + materials: + Steel: 1500 + Plastic: 1500 + +- type: latheRecipe + id: ClothingOuterArmorDuraVest + result: ClothingOuterArmorDuraVest + completetime: 10 + materials: + Steel: 500 + Plastic: 1000 + +- type: latheRecipe + id: WeaponEnergyGun + result: WeaponEnergyGun + category: Weapons + completetime: 8 + materials: + Steel: 2000 + Glass: 800 + Plastic: 500 + +- type: latheRecipe + id: WeaponEnergyGunMini + result: WeaponEnergyGunMini + category: Weapons + completetime: 4 + materials: #Half of Energy Gun Recipe + Steel: 1000 + Glass: 400 + Plastic: 250 + +- type: latheRecipe + id: WeaponEnergyGunPistol + result: WeaponEnergyGunPistol + category: Weapons + completetime: 10 + materials: + Steel: 1500 + Glass: 600 + Plastic: 400 + Gold: 150 + +- type: latheRecipe + id: WeaponGunLaserCarbineAutomatic + result: WeaponGunLaserCarbineAutomatic + category: Weapons + completetime: 15 + materials: + Steel: 2000 + Glass: 1000 + Plastic: 500 + Gold: 250 + Silver: 100 + Plasma: 500 diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index e5afdbd6def..a756768328b 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -54,6 +54,23 @@ products: Antifreeze: 4 +- type: reaction + id: ArsonistsBrew + minTemp: 373.15 + reactants: + Thermite: + amount: 1 + WeldingFuel: + amount: 1 + CapsaicinOil: + amount: 1 + Whiskey: + amount: 1 + Phosphorus: + amount: 1 + products: + ArsonistsBrew: 5 + - type: reaction id: AtomicBomb reactants: @@ -192,6 +209,18 @@ products: CubaLibre: 3 +- type: reaction + id: Daiquiri + reactants: + DeadRum: + amount: 5 + JuiceLime: + amount: 3 + Sugar: + amount: 2 + products: + Daiquiri: 10 + - type: reaction id: DemonsBlood reactants: @@ -333,6 +362,18 @@ products: Gildlager: 10 +- type: reaction + id: GreenGrass + reactants: + BlueCuracao: + amount: 2 + JuiceOrange: + amount: 3 + Ice: + amount: 1 + products: + GreenGrass: 6 + - type: reaction id: Grog reactants: @@ -345,6 +386,32 @@ products: Grog: 4 +- type: reaction + id: Gunmetal + reactants: + Cream: + amount: 1 + WeldingFuel: + amount: 1 + Rum: + amount: 1 + products: + Gunmetal: 3 + +- type: reaction + id: HealthViolation + reactants: + GargleBlaster: + amount: 10 + Moonshine: + amount: 6 + VodkaMartini: + amount: 3 + Vermouth: + amount: 1 + products: + HealthViolation: 20 + - type: reaction id: HippiesDelight reactants: @@ -494,6 +561,18 @@ products: Lemonade: 3 +- type: reaction + id: LemonDrop + reactants: + Vodka: + amount: 2 + Sugar: + amount: 2 + JuiceLemon: + amount: 1 + products: + LemonDrop: 5 + - type: reaction id: LemonLime reactants: @@ -607,6 +686,18 @@ products: Moonshine: 3 +- type: reaction + id: Mothamphetamine + reactants: + FourteenLoko: + amount: 1 + EnergyDrink: + amount: 1 + BlueCuracao: + amount: 1 + products: + Mothamphetamine: 3 + # - type: reaction # id: Neurotoxin # reactants: diff --git a/Resources/Prototypes/Recipes/Reactions/food.yml b/Resources/Prototypes/Recipes/Reactions/food.yml index 50800395698..2246cda9acd 100644 --- a/Resources/Prototypes/Recipes/Reactions/food.yml +++ b/Resources/Prototypes/Recipes/Reactions/food.yml @@ -185,6 +185,42 @@ - !type:CreateEntityReactionEffect entity: FoodSnackChocolateBar +- type: reaction + id: CookingBechamel + reactants: + Milk: + amount: 1 + Flour: + amount: 1 + OilOlive: # Butter whenever we can melt butter + amount: 1 + products: + Bechamel: 3 + +- type: reaction + id: CookingTomatoSauceOlive + reactants: + OilOlive: + amount: 1 + TableSalt: + amount: 1 + JuiceTomato: + amount: 1 + products: + TomatoSauce: 3 + +- type: reaction + id: CookingTomatoSauceCorn + reactants: + Cornoil: + amount: 1 + TableSalt: + amount: 1 + JuiceTomato: + amount: 1 + products: + TomatoSauce: 3 + # Condiments - type: reaction @@ -298,6 +334,20 @@ products: Vinaigrette: 3 +- type: reaction + id: CookingPesto + reactants: + OilOlive: + amount: 1 + TableSalt: + amount: 1 + Allicin: + amount: 1 + products: + Pesto: 3 + +# Breakdown + - type: reaction id: BananaBreakdown source: true diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml index 7432d4225f2..d82f4e6c261 100644 --- a/Resources/Prototypes/Research/arsenal.yml +++ b/Resources/Prototypes/Research/arsenal.yml @@ -178,6 +178,59 @@ - ShuttleGunFriendshipCircuitboard technologyPrerequisites: - SalvageWeapons + +# Tier 2 + +- type: technology + id: ExoticAmmunition + name: research-technology-exotic-ammunition + icon: + sprite: Objects/Weapons/Guns/Ammunition/Casings/shotgun_shell.rsi + state: beanbag + discipline: Arsenal + tier: 1 + cost: 7500 + recipeUnlocks: + - CartridgeSpecialHoly + - CartridgeSpecialMindbreaker + - ShellSoulbreaker # Nyanotrasen - Soulbreaker shotgun ammo + +- type: technology + id: EnergyGuns + name: research-technology-energy-gun + icon: + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi + state: icon + discipline: Arsenal + tier: 1 + cost: 7500 + recipeUnlocks: + - WeaponEnergyGun + - WeaponEnergyGunMini + +- type: technology + id: EnergyGunsAdvanced + name: research-technology-energy-gun-advance + icon: + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_pistol.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 7500 + recipeUnlocks: + - WeaponEnergyGunPistol + +- type: technology + id: Advanced Laser Manipulation + name: research-technology-advance-laser + icon: + sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun_carbine.rsi + state: icon + discipline: Arsenal + tier: 2 + cost: 12500 + recipeUnlocks: + - WeaponGunLaserCarbineAutomatic # Tier 3 diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml b/Resources/Prototypes/Roles/Jobs/Cargo/courier.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Roles/Jobs/Cargo/courier.yml rename to Resources/Prototypes/Roles/Jobs/Cargo/courier.yml diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 434a7c1083e..4969be8da5f 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -322,3 +322,100 @@ shoes: ClothingShoesClownBanana jumpsuit: ClothingUniformJumpsuitClownBanana mask: ClothingMaskClownBanana + +# Laika sec glasses + +- type: startingGear + id: MobSecDogLaikaGear + equipment: + eyes: ClothingEyesGlassesSunglasses + +#Oldstation Roles + +- type: startingGear + id: OldstationMedic + equipment: + jumpsuit: ClothingUniformJumpsuitMedicalDoctor + neck: ClothingNeckStethoscope + shoes: ClothingShoesColorWhite + id: MedicalIDCard + pocket1: Brutepack + pocket2: GlowstickBase + belt: ClothingBeltMedical + + +- type: startingGear + id: OldstationGuard + equipment: + jumpsuit: ClothingUniformJumpsuitSec + shoes: ClothingShoesBootsJack + id: SecurityIDCard + pocket1: Flash + pocket2: GlowstickBase + +- type: startingGear + id: OldstationEngi + equipment: + jumpsuit: ClothingUniformJumpsuitEngineering + shoes: ClothingShoesBootsWork + id: EngineeringIDCard + mask: ClothingMaskBreath + gloves: ClothingHandsGlovesColorYellowBudget + pocket1: EmergencyOxygenTankFilled + pocket2: GlowstickBase + belt: ClothingBeltUtility + +- type: startingGear + id: OldstationScientist + equipment: + jumpsuit: ClothingUniformJumpsuitScientist + shoes: ClothingShoesColorWhite + id: ResearchIDCard + pocket1: Pen + pocket2: GlowstickBase + +#Syndicate Pirate Radio Listener + +- type: startingGear + id: SyndicateListenerGear + equipment: + jumpsuit: ClothingUniformJumpsuitPyjamaSyndicateBlack + head: ClothingHeadPyjamaSyndicateBlack + ears: ClothingHeadsetAltSyndicateListening + gloves: ClothingHandsGlovesCombat + shoes: ClothingShoesSlippers + id: SyndiListeningPostPDA + innerClothingSkirt: ClothingUniformJumpsuitPyjamaSyndicatePink + +# Mobsters + +- type: startingGear + id: MobsterGear + equipment: + jumpsuit: ClothingUniformJumpsuitSuitBlackMob + back: ClothingBackpackMafiaFilled + head: ClothingHeadHatFedoraBlack + shoes: ClothingShoesBootsLaceup + neck: ClothingNeckTieBlack + outerClothing: ClothingOuterArmorBasicSlim + id: PassengerPDA + belt: ClothingBeltHolster + innerClothingSkirt: ClothingUniformJumpsuitSuitBlackMob + satchel: ClothingBackpackMafiaFilled + duffelbag: ClothingBackpackMafiaFilled + +- type: startingGear + id: MobsterGearAlt + equipment: + jumpsuit: ClothingUniformJumpsuitSuitBrown + back: ClothingBackpackMafiaFilled + head: ClothingHeadHatFlatBrown + shoes: ClothingShoesLeather + neck: ClothingNeckTieBrown + outerClothing: ClothingOuterArmorBasicSlim + id: PassengerPDA + belt: ClothingBeltSuspendersBlack + pocket1: CombatKnife + innerClothingSkirt: ClothingUniformJumpsuitSuitBrown + satchel: ClothingBackpackMafiaFilled + duffelbag: ClothingBackpackMafiaFilled diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_borg.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Roles/Jobs/Medical/medical_borg.yml rename to Resources/Prototypes/Roles/Jobs/Medical/medical_borg.yml diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/NPC/syndicateNPCs.yml b/Resources/Prototypes/Roles/Jobs/NPC/syndicateNPCs.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Roles/Jobs/NPC/syndicateNPCs.yml rename to Resources/Prototypes/Roles/Jobs/NPC/syndicateNPCs.yml diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml rename to Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml index c3dd65893c3..a2bf144926b 100644 --- a/Resources/Prototypes/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/Roles/play_time_trackers.yml @@ -82,6 +82,9 @@ - type: playTimeTracker id: JobMedicalIntern +- type: playTimeTracker + id: JobMedicalBorg + - type: playTimeTracker id: JobMime @@ -121,6 +124,9 @@ - type: playTimeTracker id: JobSecurityOfficer +- type: playTimeTracker + id: JobBrigmedic + - type: playTimeTracker id: JobSeniorEngineer diff --git a/Resources/Prototypes/DeltaV/Shaders/birdvision.yml b/Resources/Prototypes/Shaders/birdvision.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Shaders/birdvision.yml rename to Resources/Prototypes/Shaders/birdvision.yml diff --git a/Resources/Prototypes/DeltaV/SoundCollections/harpy.yml b/Resources/Prototypes/SoundCollections/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/SoundCollections/harpy.yml rename to Resources/Prototypes/SoundCollections/harpy.yml diff --git a/Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml b/Resources/Prototypes/SoundCollections/vulpkanin.yml similarity index 100% rename from Resources/Prototypes/DeltaV/SoundCollections/vulpkanin.yml rename to Resources/Prototypes/SoundCollections/vulpkanin.yml diff --git a/Resources/Prototypes/DeltaV/Species/harpy.yml b/Resources/Prototypes/Species/harpy.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Species/harpy.yml rename to Resources/Prototypes/Species/harpy.yml diff --git a/Resources/Prototypes/DeltaV/Species/vulpkanin.yml b/Resources/Prototypes/Species/vulpkanin.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Species/vulpkanin.yml rename to Resources/Prototypes/Species/vulpkanin.yml diff --git a/Resources/Prototypes/StatusEffects/job.yml b/Resources/Prototypes/StatusEffects/job.yml index 782cacfdd52..21fa5cc9dd6 100644 --- a/Resources/Prototypes/StatusEffects/job.yml +++ b/Resources/Prototypes/StatusEffects/job.yml @@ -374,3 +374,10 @@ icon: sprite: /Textures/Interface/Misc/job_icons.rsi state: Visitor + +- type: statusIcon + parent: JobIcon + id: JobIconMedicalBorg + icon: + sprite: DeltaV/Interface/Misc/job_icons.rsi + state: MedicalBorg diff --git a/Resources/Prototypes/DeltaV/Traits/altvision.yml b/Resources/Prototypes/Traits/altvision.yml similarity index 100% rename from Resources/Prototypes/DeltaV/Traits/altvision.yml rename to Resources/Prototypes/Traits/altvision.yml diff --git a/Resources/Prototypes/Traits/neutral.yml b/Resources/Prototypes/Traits/neutral.yml index 9e7f7655076..c62b04ec716 100644 --- a/Resources/Prototypes/Traits/neutral.yml +++ b/Resources/Prototypes/Traits/neutral.yml @@ -16,3 +16,11 @@ - type: MothAccent - type: ReplacementAccent accent: dwarf + +- type: trait + id: ScottishAccent + name: trait-scottish-accent-name + description: trait-scottish-accent-desc + traitGear: BagpipeInstrument + components: + - type: ScottishAccent \ No newline at end of file diff --git a/Resources/Prototypes/Voice/speech_emote_sounds.yml b/Resources/Prototypes/Voice/speech_emote_sounds.yml index ee76fa33d2c..2a1a6696f4f 100644 --- a/Resources/Prototypes/Voice/speech_emote_sounds.yml +++ b/Resources/Prototypes/Voice/speech_emote_sounds.yml @@ -380,3 +380,125 @@ sounds: Chirp: path: /Audio/Animals/nymph_chirp.ogg + +# species +- type: emoteSounds + id: SoundsHarpy + params: + variation: 0.125 + sounds: + Scream: + collection: HarpyScreams + Laugh: + collection: HarpyLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Sigh: + collection: MaleSigh + Crying: + collection: HarpyCry + Whistle: + collection: Whistles + Hiss: + collection: HarpyHisses + Meow: + collection: HarpyMeows + Mew: + collection: HarpyMews + Growl: + collection: HarpyGrowls + Purr: + collection: HarpyPurrs + Ring: + collection: HarpyRings + HonkHarpy: + collection: HarpyHonks + Pew: + collection: HarpyPews + Bang: + collection: HarpyBangs + Beep: + collection: HarpyBeeps + Rev: + collection: HarpyRevs +# Click: +# collection: HarpyClicks + Chitter: + collection: HarpyChitter + Squeak: + collection: HarpySqueak + Caw: + collection: HarpyCaws + Chirp: + collection: HarpyChirps # TODO: TEST THIS. BUG-REPORTS ON DELTA SAID THIS IS BROKEN. + Snarl: + collection: VulpkaninSnarls + Bark: + collection: VulpkaninBarks + Whine: + collection: VulpkaninWhines + Howl: + collection: VulpkaninHowls + +- type: emoteSounds + id: MaleVulpkanin + params: + variation: 0.125 + sounds: + Scream: + collection: MaleScreams + Laugh: + collection: MaleLaugh + Sneeze: + collection: MaleSneezes + Cough: + collection: MaleCoughs + Crying: + collection: MaleCry + Whistle: + collection: Whistles + Sigh: + collection: MaleSigh + Growl: + collection: VulpkaninGrowls + Snarl: + collection: VulpkaninSnarls + Bark: + collection: VulpkaninBarks + Whine: + collection: VulpkaninWhines + Howl: + collection: VulpkaninHowls + +- type: emoteSounds + id: FemaleVulpkanin + params: + variation: 0.125 + sounds: + Scream: + collection: FemaleScreams + Laugh: + collection: FemaleLaugh + Sneeze: + collection: FemaleSneezes + Cough: + collection: FemaleCoughs + Crying: + collection: FemaleCry + Whistle: + collection: Whistles + Sigh: + collection: FemaleSigh + Growl: + collection: VulpkaninGrowls + Snarl: + collection: VulpkaninSnarls + Bark: + collection: VulpkaninBarks + Whine: + collection: VulpkaninWhines + Howl: + collection: VulpkaninHowls + diff --git a/Resources/Prototypes/Voice/speech_emotes.yml b/Resources/Prototypes/Voice/speech_emotes.yml index 8e33f483aa3..e8cece36a59 100644 --- a/Resources/Prototypes/Voice/speech_emotes.yml +++ b/Resources/Prototypes/Voice/speech_emotes.yml @@ -264,3 +264,143 @@ - chirping - chirping. - chirping! + +# Harpy +- type: emote + id: HonkHarpy + category: Vocal + chatMessages: [honks.] + chatTriggers: + - honk. + - honks. + - honks! + - honking. + - honked. + +- type: emote + id: Ring + category: Vocal + chatMessages: [rings.] + chatTriggers: + - ring. + - rings. + - rings! + - ringing. + - ringed. + +- type: emote + id: Pew + category: Vocal + chatMessages: [pews.] + chatTriggers: + - pew. + - pews. + - pew! + +- type: emote + id: Bang + category: Vocal + chatMessages: [bangs.] + chatTriggers: + - bangs. + - bang. + - bang! + - banging. + - banged. + +- type: emote + id: Beep + category: Vocal + chatMessages: [beeps.] + chatTriggers: + - beeps. + - beep. + - beep! + - beeping. + - beeped. + +- type: emote + id: Rev + category: Vocal + chatMessages: [revs.] + chatTriggers: + - revs. + - rev. + - rev! + - revving + - revved + +#- type: emote +# id: Click +# category: Vocal +# chatMessages: [clicks.] +# chatTriggers: +# - clicks. +# - click. +# - click! +# - clicking. +# - clicked. + +- type: emote + id: Caw + category: Vocal + chatMessages: [caws.] + chatTriggers: + - caws. + - caw. + - caw! + - cawing + - cawed + +#Vulpkanin +- type: emote + id: Bark + category: Vocal + chatMessages: [barks.] + chatTriggers: + - bark. + - bark! + - barks. + - barks! + - barked. + - barked! + - barking. + +- type: emote + id: Snarl + category: Vocal + chatMessages: [snarls.] + chatTriggers: + - snarl. + - snarl! + - snarls. + - snarls! + - snarled. + - snarled! + - snarling. + +- type: emote + id: Whine + category: Vocal + chatMessages: [whines.] + chatTriggers: + - whine. + - whine! + - whines. + - whines! + - whined. + - whined! + - whining. + +- type: emote + id: Howl + category: Vocal + chatMessages: [howls.] + chatTriggers: + - howl. + - howl! + - howls. + - howls! + - howling. + - howled. + diff --git a/Resources/Prototypes/Voice/speech_sounds.yml b/Resources/Prototypes/Voice/speech_sounds.yml index eb47b5363b6..5f385814be9 100644 --- a/Resources/Prototypes/Voice/speech_sounds.yml +++ b/Resources/Prototypes/Voice/speech_sounds.yml @@ -123,3 +123,22 @@ path: /Audio/Animals/dog_bark3.ogg exclaimSound: path: /Audio/Animals/dog_bark2.ogg + +- type: speechSounds + id: Vulpkanin + saySound: + path: /Audio/DeltaV/Voice/Talk/vulp.ogg + askSound: + path: /Audio/DeltaV/Voice/Talk/vulp_ask.ogg + exclaimSound: + path: /Audio/DeltaV/Voice/Talk/vulp_exclaim.ogg + +- type: speechSounds + id: Harpy + saySound: + path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg + askSound: + path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg + exclaimSound: + path: /Audio/DeltaV/Voice/Harpy/chirp1.ogg + diff --git a/Resources/Prototypes/Voice/speech_verbs.yml b/Resources/Prototypes/Voice/speech_verbs.yml index 1cdda32ece1..310af52ab24 100644 --- a/Resources/Prototypes/Voice/speech_verbs.yml +++ b/Resources/Prototypes/Voice/speech_verbs.yml @@ -135,3 +135,28 @@ - chat-speech-verb-electricity-1 - chat-speech-verb-electricity-2 - chat-speech-verb-electricity-3 + +- type: speechVerb + id: Vulpkanin + speechVerbStrings: + - chat-speech-verb-vulpkanin-1 + - chat-speech-verb-vulpkanin-2 + - chat-speech-verb-vulpkanin-3 + - chat-speech-verb-vulpkanin-4 + +- type: speechVerb + id: Felinid + speechVerbStrings: + - chat-speech-verb-felinid-1 + - chat-speech-verb-felinid-2 + - chat-speech-verb-felinid-3 + - chat-speech-verb-felinid-4 + +- type: speechVerb + id: Harpy + speechVerbStrings: + - chat-speech-verb-harpy-1 + - chat-speech-verb-harpy-2 + - chat-speech-verb-harpy-3 + - chat-speech-verb-harpy-4 + diff --git a/Resources/Prototypes/ore.yml b/Resources/Prototypes/ore.yml index dde1516c855..0fc3e85182e 100644 --- a/Resources/Prototypes/ore.yml +++ b/Resources/Prototypes/ore.yml @@ -104,3 +104,17 @@ OreIronCrab: 5 OreUraniumCrab: 2 OreSilverCrab: 3 + +#Ported from Nyano + +- type: weightedRandomOre + id: RandomOreDistributionHigh + weights: + OreSteel: 1 + OreSpaceQuartz: 2 + OreGold: 10 + OrePlasma: 8 + OreSilver: 4 + OreUranium: 6 + OreArtifactFragment: 0.5 + diff --git a/Resources/Prototypes/radio_channels.yml b/Resources/Prototypes/radio_channels.yml index 48cc0872a1a..2b089425a50 100644 --- a/Resources/Prototypes/radio_channels.yml +++ b/Resources/Prototypes/radio_channels.yml @@ -95,3 +95,10 @@ color: "#f6ce64" # long range since otherwise it'd defeat the point of a handheld radio independent of telecomms longRange: true + +- type: radioChannel + id: Prison + name: chat-radio-prison + keycode: 'p' + frequency: 1601 + color: "#FFA500" diff --git a/Resources/Prototypes/DeltaV/shaders.yml b/Resources/Prototypes/shaders.yml similarity index 100% rename from Resources/Prototypes/DeltaV/shaders.yml rename to Resources/Prototypes/shaders.yml diff --git a/Resources/Prototypes/silicon-laws.yml b/Resources/Prototypes/silicon-laws.yml index 8682048a5e0..d4485ac09cc 100644 --- a/Resources/Prototypes/silicon-laws.yml +++ b/Resources/Prototypes/silicon-laws.yml @@ -162,6 +162,589 @@ - Ninja4 obeysTo: laws-owner-spider-clan +# Delta-V Laws +# Job-Based LawSets + +- type: siliconLaw + id: Medical1 + order: 1 + lawString: law-medical-1 + +- type: siliconLaw + id: Medical2 + order: 2 + lawString: law-medical-2 + +- type: siliconLaw + id: Medical3 + order: 3 + lawString: law-medical-3 + +- type: siliconLaw + id: Medical4 + order: 4 + lawString: law-medical-4 + +- type: siliconLaw + id: Medical5 + order: 5 + lawString: law-medical-5 + +- type: siliconLawset + id: Medical + laws: + - Medical1 + - Medical2 + - Medical3 + - Medical4 + - Medical5 + obeysTo: laws-owner-crew + +- type: siliconLaw + id: Research1 + order: 1 + lawString: law-research-1 + +- type: siliconLaw + id: Research2 + order: 2 + lawString: law-research-2 + +- type: siliconLaw + id: Research3 + order: 3 + lawString: law-research-3 + +- type: siliconLaw + id: Research4 + order: 4 + lawString: law-research-4 + +- type: siliconLaw + id: Research5 + order: 5 + lawString: law-research-5 + +- type: siliconLaw + id: Research6 + order: 6 + lawString: law-research-6 + +- type: siliconLawset + id: Research + laws: + - Research1 + - Research2 + - Research3 + - Research4 + - Research5 + - Research6 + obeysTo: laws-owner-crew + +- type: siliconLaw + id: Engineer1 + order: 1 + lawString: law-engineer-1 + +- type: siliconLaw + id: Engineer2 + order: 2 + lawString: law-engineer-2 + +- type: siliconLaw + id: Engineer3 + order: 3 + lawString: law-engineer-3 + +- type: siliconLaw + id: Engineer4 + order: 4 + lawString: law-engineer-4 + +- type: siliconLaw + id: Engineer5 + order: 5 + lawString: law-engineer-5 + +- type: siliconLawset + id: Engineer + laws: + - Engineer1 + - Engineer2 + - Engineer3 + - Engineer4 + - Engineer5 + obeysTo: laws-owner-station-station + +- type: siliconLaw + id: Janitor1 + order: 1 + lawString: law-janitor-1 + +- type: siliconLaw + id: Janitor2 + order: 2 + lawString: law-janitor-2 + +- type: siliconLaw + id: Janitor3 + order: 3 + lawString: law-janitor-3 + +- type: siliconLaw + id: Janitor4 + order: 4 + lawString: law-janitor-4 + +- type: siliconLaw + id: Janitor5 + order: 5 + lawString: law-janitor-5 + +- type: siliconLawset + id: Janitor + laws: + - Janitor1 + - Janitor2 + - Janitor3 + - Janitor4 + - Janitor5 + obeysTo: laws-owner-charge + +- type: siliconLaw + id: Clown1 + order: 1 + lawString: law-clown-1 + +- type: siliconLaw + id: Clown2 + order: 2 + lawString: law-clown-2 + +- type: siliconLaw + id: Clown3 + order: 3 + lawString: law-clown-3 + +- type: siliconLaw + id: Clown4 + order: 4 + lawString: law-clown-4 + +- type: siliconLaw + id: Clown5 + order: 5 + lawString: law-clown-5 + +- type: siliconLaw + id: Clown6 + order: 6 + lawString: law-clown-6 + +- type: siliconLawset + id: Clown + laws: + - Clown1 + - Clown2 + - Clown3 + - Clown4 + - Clown5 + - Clown6 + obeysTo: laws-owner-crew + +- type: siliconLaw + id: Chaplain1 + order: 1 + lawString: law-chaplain-1 + +- type: siliconLaw + id: Chaplain2 + order: 2 + lawString: law-chaplain-2 + +- type: siliconLaw + id: Chaplain3 + order: 3 + lawString: law-chaplain-3 + +- type: siliconLaw + id: Chaplain4 + order: 4 + lawString: law-chaplain-4 + +- type: siliconLaw + id: Chaplain5 + order: 5 + lawString: law-chaplain-5 + +- type: siliconLawset + id: Chaplain + laws: + - Chaplain1 + - Chaplain2 + - Chaplain3 + - Chaplain4 + - Chaplain5 + obeysTo: laws-owner-station + + +- type: siliconLaw + id: Reporter1 + order: 1 + lawString: law-reporter-1 + +- type: siliconLaw + id: Reporter2 + order: 2 + lawString: law-reporter-2 + +- type: siliconLaw + id: Reporter3 + order: 3 + lawString: law-reporter-3 + +- type: siliconLaw + id: Reporter4 + order: 4 + lawString: law-reporter-4 + +- type: siliconLawset + id: Reporter + laws: + - Reporter1 + - Reporter2 + - Reporter3 + - Reporter4 + obeysTo: laws-owner-organic + +- type: siliconLaw # no Security Borg, so doesn't spawn + id: SiliconPolice1 + order: 1 + lawString: law-silicon-police-1 + +- type: siliconLaw + id: SiliconPolice2 + order: 2 + lawString: law-silicon-police-2 + +- type: siliconLaw + id: SiliconPolice3 + order: 3 + lawString: law-silicon-police-3 + +- type: siliconLaw + id: SiliconPolice4 + order: 4 + lawString: law-silicon-police-4 + +- type: siliconLaw + id: SiliconPolice5 + order: 5 + lawString: law-silicon-police-5 + +- type: siliconLaw + id: SiliconPolice6 + order: 6 + lawString: law-silicon-police-6 + +- type: siliconLawset + id: SiliconPolice1 + laws: + - SiliconPolice1 + - SiliconPolice2 + - SiliconPolice3 + - SiliconPolice4 + - SiliconPolice5 + - SiliconPolice6 + obeysTo: laws-owner-crew + +# Gimmick LawSets + + +- type: siliconLaw + id: Cowboy1 + order: 1 + lawString: law-cowboy-1 + +- type: siliconLaw + id: Cowboy2 + order: 2 + lawString: law-cowboy-2 + +- type: siliconLaw + id: Cowboy3 + order: 3 + lawString: law-cowboy-3 + +- type: siliconLaw + id: Cowboy4 + order: 4 + lawString: law-cowboy-4 + +- type: siliconLaw + id: Cowboy5 + order: 5 + lawString: law-cowboy-5 + +- type: siliconLaw + id: Cowboy6 + order: 6 + lawString: law-cowboy-6 + +- type: siliconLawset + id: Cowboy + laws: + - Cowboy1 + - Cowboy2 + - Cowboy3 + - Cowboy4 + - Cowboy5 + - Cowboy6 + obeysTo: laws-owner-cowboy + +- type: siliconLaw + id: StationEfficiency1 + order: 1 + lawString: law-station-efficiency-1 + +- type: siliconLaw + id: StationEfficiency2 + order: 2 + lawString: law-station-efficiency-2 + +- type: siliconLaw + id: StationEfficiency3 + order: 3 + lawString: law-station-efficiency-3 + +- type: siliconLawset + id: StationEfficiency + laws: + - StationEfficiency1 + - StationEfficiency2 + - StationEfficiency3 + obeysTo: laws-owner-crew + +- type: siliconLaw + id: Druid1 + order: 1 + lawString: law-druid-1 + +- type: siliconLaw + id: Druid2 + order: 2 + lawString: law-druid-2 + +- type: siliconLaw + id: Druid3 + order: 3 + lawString: law-druid-3 + +- type: siliconLaw + id: Druid4 + order: 4 + lawString: law-druid-4 + +- type: siliconLaw + id: Druid5 + order: 5 + lawString: law-druid-5 + +- type: siliconLawset + id: Druid + laws: + - Druid1 + - Druid2 + - Druid3 + - Druid4 + - Druid5 + obeysTo: laws-owner-organic + +- type: siliconLaw # No ability for Borgs to roll dice, so won't spawn. + id: DungeonMaster1 + order: 1 + lawString: law-dungeonmaster-1 + +- type: siliconLaw + id: DungeonMaster2 + order: 2 + lawString: law-dungeonmaster-2 + +- type: siliconLaw + id: DungeonMaster3 + order: 3 + lawString: law-dungeonmaster-3 + +- type: siliconLaw + id: DungeonMaster4 + order: 4 + lawString: law-dungeonmaster-4 + +- type: siliconLaw + id: DungeonMaster5 + order: 5 + lawString: law-dungeonmaster-5 + +- type: siliconLaw + id: DungeonMaster6 + order: 6 + lawString: law-dungeonmaster-6 + +- type: siliconLawset + id: DungeonMaster + laws: + - DungeonMaster1 + - DungeonMaster2 + - DungeonMaster3 + - DungeonMaster4 + - DungeonMaster5 + - DungeonMaster6 + obeysTo: laws-owner-players + + +- type: siliconLaw + id: Painter1 + order: 1 + lawString: law-painter-1 + +- type: siliconLaw + id: Painter2 + order: 2 + lawString: law-painter-2 + +- type: siliconLaw + id: Painter3 + order: 3 + lawString: law-painter-3 + +- type: siliconLawset # No ability for Borgs to paint, so won't spawn. + id: Painter + laws: + - Painter1 + - Painter2 + - Painter3 + obeysTo: laws-owner-crew + +#Potential For Harm LawSets + +- type: siliconLaw + id: Tyrant1 + order: 1 + lawString: law-tyrant-1 + +- type: siliconLaw + id: Tyrant2 + order: 2 + lawString: law-tyrant-2 + +- type: siliconLaw + id: Tyrant3 + order: 3 + lawString: law-tyrant-3 + +- type: siliconLaw + id: Tyrant4 + order: 4 + lawString: law-tyrant-4 + +- type: siliconLawset + id: Tyrant + laws: + - Tyrant1 + - Tyrant2 + - Tyrant3 + - Tyrant4 + obeysTo: laws-owner-tyrant + +- type: siliconLaw + id: LiveAndLetLive1 + order: 1 + lawString: law-liveandletlive-1 + +- type: siliconLaw + id: LiveAndLetLive2 + order: 2 + lawString: law-liveandletlive-2 + +- type: siliconLawset + id: LiveAndLetLive + laws: + - LiveAndLetLive1 + - LiveAndLetLive2 + obeysTo: laws-owner-crew + +- type: siliconLaw + id: Nutimov1 + order: 1 + lawString: law-nutimov-1 + +- type: siliconLaw + id: Nutimov2 + order: 2 + lawString: law-nutimov-2 + +- type: siliconLaw + id: Nutimov3 + order: 3 + lawString: law-nutimov-3 + +- type: siliconLaw + id: Nutimov4 + order: 4 + lawString: law-nutimov-4 + +- type: siliconLaw + id: Nutimov5 + order: 5 + lawString: law-nutimov-5 + +- type: siliconLawset + id: Nutimov + laws: + - Nutimov1 + - Nutimov2 + - Nutimov3 + - Nutimov4 + - Nutimov5 + obeysTo: laws-owner-nutimov + + +- type: siliconLaw + id: Paladin1 + order: 1 + lawString: law-paladin-1 + +- type: siliconLaw + id: Paladin2 + order: 2 + lawString: law-paladin-2 + +- type: siliconLaw + id: Paladin3 + order: 3 + lawString: law-paladin-3 + +- type: siliconLaw + id: Paladin4 + order: 4 + lawString: law-paladin-4 + +- type: siliconLaw + id: Paladin5 + order: 5 + lawString: law-paladin-5 + +- type: siliconLawset + id: Paladin + laws: + - Paladin1 + - Paladin2 + - Paladin3 + - Paladin4 + - Paladin5 + obeysTo: laws-owner-paladin + + # ion storm random lawsets - type: weightedRandom id: IonStormLawsets diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 9f06df7bcb3..3c92440cabe 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1259,4 +1259,49 @@ - type: Tag id: WriteIgnoreStamps -# PUT YOUR TAGS IN ALPHABETICAL ORDER +# PUT YOUR TAGS IN ALPHABETICAL ORDER - NO + +## This is for Nyano and Delta V tags + +- type: Tag + id: BeltSlotNotBelt #not a 'belt' + +- type: Tag + id: BulletBB + +- type: Tag + id: CartridgeSpecial # For the .38 special ammo and revolver + +- type: Tag + id: Directional + +- type: Tag + id: ForensicBeltEquip + +- type: Tag + id: HandLabeler + +- type: Tag + id: HidesHarpyWings + +- type: Tag + id: MagazinePistolSpecial # For the .38 special ammo and pistol + +- type: Tag + id: SecDogWearable # allows Laika to wear meson goggles (and more later?) + +- type: Tag + id: SpeedLoaderSpecial + +- type: Tag + id: PreventLabel + +- type: Tag + id: BionicSyrinxImplant + +- type: Tag + id: PaperSlip + +- type: Tag + id: Skirt + diff --git a/Resources/Prototypes/typing_indicator.yml b/Resources/Prototypes/typing_indicator.yml index 7271770ef50..8a6d97555c6 100644 --- a/Resources/Prototypes/typing_indicator.yml +++ b/Resources/Prototypes/typing_indicator.yml @@ -48,3 +48,9 @@ id: slime typingState: slime0 offset: 0, 0.125 + +- type: typingIndicator + id: felinid + spritePath: /Textures/DeltaV/Effects/speech.rsi + typingState: felinid0 + offset: 0, 0.2 # 0625 diff --git a/Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png rename to Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Backpacks/brigmedic.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Back/Backpacks/brigmedic.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png rename to Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Duffels/brigmedic.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Back/Duffels/brigmedic.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png rename to Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Back/Satchels/brigmedic.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Back/Satchels/brigmedic.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/equipped-BELT.png rename to Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/equipped-BELT.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/ceremonial.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Belt/ceremonial.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/equipped-BELT.png rename to Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/equipped-BELT.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/corpsman.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Belt/corpsman.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Belt/courierbag.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Clothing/Belt/courierbag.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/courierbag.rsi/equipped-BELT.png rename to Resources/Textures/Clothing/Clothing/Belt/courierbag.rsi/equipped-BELT.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/courierbag.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Belt/courierbag.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/courierbag.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Belt/courierbag.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/courierbag.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Belt/courierbag.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/courierbag.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Belt/courierbag.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/equipped-BELT.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/equipped-BELT.png rename to Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/equipped-BELT.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Belt/suspendersblack.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Belt/suspendersblack.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/prisoner.rsi/equipped-EARS.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Ears/Headsets/prisoner.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/prisoner.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Ears/Headsets/prisoner.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/prisoner.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/equipped-EARS.png b/Resources/Textures/Clothing/Clothing/Ears/Headsets/securitymedical.rsi/equipped-EARS.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/equipped-EARS.png rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/securitymedical.rsi/equipped-EARS.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Ears/Headsets/securitymedical.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/securitymedical.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Ears/Headsets/securitymedical.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/securitymedical.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/securitymedical.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Clothing/Ears/Headsets/service.rsi/alt-equipped-EARS.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/alt-equipped-EARS.png rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/service.rsi/alt-equipped-EARS.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png b/Resources/Textures/Clothing/Clothing/Ears/Headsets/service.rsi/icon_alt.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/icon_alt.png rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/service.rsi/icon_alt.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Ears/Headsets/service.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/service.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/service.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/alt-equipped-EARS.png b/Resources/Textures/Clothing/Clothing/Ears/Headsets/syndicate_listening.rsi/alt-equipped-EARS.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/alt-equipped-EARS.png rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/syndicate_listening.rsi/alt-equipped-EARS.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png b/Resources/Textures/Clothing/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/syndicate_listening.rsi/icon_alt.png diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png rename to Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/equipped-EYES.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Eyes/Glasses/safetyglasses.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/equipped-EYES.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/equipped-EYES.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescmedhud.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescmedhud.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/equipped-EYES.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/equipped-EYES.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/prescsechud.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/prescsechud.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/equipped-EYES.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/equipped-EYES.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/equipped-EYES.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/meta.json similarity index 94% rename from Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/meta.json index dda2a1b1b69..1d01bc88809 100644 --- a/Resources/Textures/DeltaV/Clothing/Eyes/Hud/syndmed.rsi/meta.json +++ b/Resources/Textures/Clothing/Clothing/Eyes/Hud/syndmed.rsi/meta.json @@ -1,26 +1,26 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by IntegerTempest, medicalised by JoeHammad1844 (github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-EYES", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by IntegerTempest, medicalised by JoeHammad1844 (github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-EYES", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/equipped-HAND.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/hvchemresgloves.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/equipped-HAND.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/equipped-HAND.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/inspection.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/inspection.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/equipped-HAND.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/equipped-HAND.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/equipped-HAND.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Hands/Gloves/ryuzogauntlets.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Hands/Gloves/ryuzogauntlets.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/icon-flash.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/icon-flash.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/icon-flash.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/advanced.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/advanced.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/icon-flash.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/icon-flash.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/icon-flash.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/corpsman.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/corpsman.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/icon-flash.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/icon-flash.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/icon-flash.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-harpy.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-harpy.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/hos.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/icon-flash.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/icon-flash.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/icon-flash.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/medical.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/medical.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/icon-flash.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/icon-flash.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/icon-flash.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-harpy.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-harpy.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/officer.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/icon-flash.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/icon-flash.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/icon-flash.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/riot.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/riot.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/icon-flash.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/icon-flash.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/icon-flash.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-harpy.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-harpy.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-harpy.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/standard.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/icon-flash.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/icon-flash.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/icon-flash.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/icon-flash.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/off-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/off-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/off-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/off-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/off-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/off-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/off-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/on-equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/on-equipped-HELMET-vulpkanin.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/on-equipped-HELMET-vulpkanin.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/on-equipped-HELMET-vulpkanin.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/on-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hardsuits/Combat/warden.rsi/on-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hardsuits/Combat/warden.rsi/on-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_corpsman.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_corpsman.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET-hamster.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET-hamster.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET-hamster.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_hos.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_hos.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_hos.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_hos.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_hos.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_lo.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_lo.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_security.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_security.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_warden.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_warden.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_warden.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_warden.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_warden.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_warden.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_warden.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/beret_warden.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/beret_warden.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/beret_warden.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/beret_warden.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/blackfedora.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/blackfedora.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/brownfedora.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/brownfedora.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/dircap.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/dircap.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatblack.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatblack.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/flatbrown.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/flatbrown.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png b/Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET-hamster.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/hoshat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/hoshat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/mysta.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/mysta.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_black.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_black.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cyan.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cyan.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_cybersun.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_cybersun.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_pink.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_pink.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_rainbow.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_rainbow.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/surgcap_white.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/surgcap_white.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/warden.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/warden.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/warden.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/warden.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/warden.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/warden.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/warden.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/warden.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/warden.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Hats/whitefedora.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Hats/whitefedora.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/light_riot.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Helmets/light_riot.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/light-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/lighton-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Helmets/security.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Helmets/security.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/flipped-equipped-HELMET.png b/Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/flipped-equipped-HELMET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/flipped-equipped-HELMET.png rename to Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/flipped-equipped-HELMET.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/flipped-icon.png b/Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/flipped-icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/flipped-icon.png rename to Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/flipped-icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Head/Soft/couriersoft.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Head/Soft/couriersoft.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/boatcloak.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/boatcloak.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/boatcloak.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/boatcloak.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/boatcloak.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/boatcloak.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/boatcloak.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/mystacloak.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/mystacloak.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/mystacloak.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/mystacloak.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/mystacloak.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/mystacloak.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/mystacloak.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/salvage.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/salvage.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/salvage.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Cloaks/salvage.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Cloaks/salvage.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Cloaks/salvage.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/blackstar.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/blackstar.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/blackstar.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/blackstar.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/blackstar.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/blackstar.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/blackstar.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/blackstar.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/blackstar.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Medals/blackstar.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/blackstar.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Medals/blackstar.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/cargomedal.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/cargomedal.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/cargomedal.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/cargomedal.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/cargomedal.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Medals/cargomedal.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/cargomedal.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Medals/cargomedal.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/clownmedal.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/clownmedal.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/clownmedal.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/clownmedal.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/clownmedal.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Medals/clownmedal.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/clownmedal.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Medals/clownmedal.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/engineermedal.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/engineermedal.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/engineermedal.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/engineermedal.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/engineermedal.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Medals/engineermedal.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/engineermedal.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Medals/engineermedal.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/medicalmedal.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/medicalmedal.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/medicalmedal.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/medicalmedal.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/medicalmedal.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Medals/medicalmedal.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/medicalmedal.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Medals/medicalmedal.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/sciencemedal.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/sciencemedal.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/sciencemedal.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/sciencemedal.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/sciencemedal.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Medals/sciencemedal.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/sciencemedal.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Medals/sciencemedal.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/securitymedal.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Medals/securitymedal.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/securitymedal.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Medals/securitymedal.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Medals/securitymedal.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Medals/securitymedal.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Medals/securitymedal.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Medals/securitymedal.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/blacktie.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Ties/blacktie.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/bluetie.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Ties/bluetie.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/browntie.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Ties/browntie.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK-hamster.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/chemtie.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Ties/chemtie.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/greentie.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Ties/greentie.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/Ties/whitetie.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/Ties/whitetie.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/ryuzo.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Clothing/Neck/mantles/ryuzo.rsi/equipped-NECK.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/mantles/ryuzo.rsi/equipped-NECK.png rename to Resources/Textures/Clothing/Clothing/Neck/mantles/ryuzo.rsi/equipped-NECK.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/ryuzo.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Neck/mantles/ryuzo.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/mantles/ryuzo.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Neck/mantles/ryuzo.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Neck/mantles/ryuzo.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Neck/mantles/ryuzo.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Neck/mantles/ryuzo.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Neck/mantles/ryuzo.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/duravest.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/duravest.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/platecarrier.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Armor/riot.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Armor/riot.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/cybersunwindbreaker.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/epicoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/greatcoat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/greatcoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hop.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hop.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/leatherjacket.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/leatherjacket.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/mystacoat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/mystacoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/overcoat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/overcoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/repcoat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/repcoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/ryuzocoat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Coats/ryuzocoat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/advanced.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/corpsman.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/hos.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/medical.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/officer.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/riot.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/standard.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING-harpy.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Hardsuits/Combat/warden.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Misc/chemapron.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flak.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flak.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/flakpress.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/Vests/flakpress.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/cc_warden_winter_coat.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/corpo_jacket.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/denim_jacket.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/meta.json b/Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/OuterClothing/WinterCoats/stasecsweater.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/fishing_boots.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/fishing_boots.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/fishing_boots.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/fishing_boots.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/fishing_boots.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/fishing_boots.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/fishing_boots.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/ryuzoboots.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/ryuzoboots.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsatmos.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscap.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscap.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsce.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscentcom.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschef.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschef.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootschem.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootschem.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsclown.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsclown.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootscmo.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootscmo.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsgen.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsgen.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshop.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshos.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootshydro.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsjani.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsjani.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsmime.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsminer.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsminer.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsparamed.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsparamed.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsqm.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrd.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsrobo.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootsviro.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Boots/winterbootswarden.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Misc/whiteleather.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Misc/whiteleather.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png b/Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png rename to Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/equipped-FEET.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Shoes/Specific/enclosedshoes.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/brigmedic.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/centcom_officer.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/courier.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/courier.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hopmesskit.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_blue.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/hos_grey.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_blue.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_blue.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/security_grey.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/security_grey.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_blue.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpskirt/warden_grey.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/brigmedic.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING-monkey.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/chemshirtsuit.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/courier.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/courier.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/explorer.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/explorer.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/centcom_officer.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hopmesskit.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_blue.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_brown.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_green.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/jeans_red.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/kilt.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/kilt.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/lost_tourist.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/secformal.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/secformal.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_blue.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/sober.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/sober.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/black.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/black.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cyan.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cyan.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/cybersun.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/cybersun.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/pink.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/pink.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/rainbow.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/rainbow.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/icon.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/icon.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/inhand-left.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/inhand-left.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/inhand-right.png b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/inhand-right.png rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/meta.json b/Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Scrubs/white.rsi/meta.json rename to Resources/Textures/Clothing/Clothing/Uniforms/Scrubs/white.rsi/meta.json diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..92095419971 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/icon.png new file mode 100644 index 00000000000..92e5fa6e564 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/inhand-left.png new file mode 100644 index 00000000000..2f17477f388 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/inhand-right.png new file mode 100644 index 00000000000..c375216880e Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/meta.json new file mode 100644 index 00000000000..7e116711bc2 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_black.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @Leonardo DaBepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..783c0e84107 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/icon.png new file mode 100644 index 00000000000..6618978f58f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-left.png new file mode 100644 index 00000000000..bcafa4b82cc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-right.png new file mode 100644 index 00000000000..8a543ba0d4b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/meta.json new file mode 100644 index 00000000000..7e116711bc2 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_cyan.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @Leonardo DaBepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..28cdcf792e0 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/icon.png new file mode 100644 index 00000000000..bcfe8d0e86b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-left.png new file mode 100644 index 00000000000..28e6b220dfd Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-right.png new file mode 100644 index 00000000000..0d126ca1173 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/meta.json new file mode 100644 index 00000000000..7e116711bc2 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_cybersun.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @Leonardo DaBepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..385cb6d84a7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/icon.png new file mode 100644 index 00000000000..8f0fc7ad224 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/inhand-left.png new file mode 100644 index 00000000000..aa3e5360860 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/inhand-right.png new file mode 100644 index 00000000000..549f7cb542c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/meta.json new file mode 100644 index 00000000000..7e116711bc2 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_pink.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @Leonardo DaBepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..f2b32d9134b Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/icon.png new file mode 100644 index 00000000000..77da8795a06 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-left.png new file mode 100644 index 00000000000..30fb020406a Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-right.png new file mode 100644 index 00000000000..80d55ae3ae3 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/meta.json new file mode 100644 index 00000000000..7e116711bc2 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_rainbow.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @Leonardo DaBepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..eff0c40c0b8 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/icon.png new file mode 100644 index 00000000000..ddaf049c7c4 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/inhand-left.png new file mode 100644 index 00000000000..70b0ab3d01f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/inhand-right.png new file mode 100644 index 00000000000..2c3507cb941 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/meta.json new file mode 100644 index 00000000000..7e116711bc2 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/surgcap_white.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by @Leonardo DaBepis", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/boatswain.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/boatswain.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblack.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhite.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblack.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitealt.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackalt.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitwhitemob.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitblackmob.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrown.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_blue.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownalt.rsi/meta.json diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/equipped-INNERCLOTHING.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/equipped-INNERCLOTHING.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/equipped-INNERCLOTHING.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/icon.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/icon.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/icon.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/icon.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/inhand-left.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/inhand-left.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/inhand-left.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/inhand-right.png b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/inhand-right.png rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/inhand-right.png diff --git a/Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/meta.json b/Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/meta.json similarity index 100% rename from Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/warden_grey.rsi/meta.json rename to Resources/Textures/Clothing/Uniforms/Jumpsuit/suitbrownmob.rsi/meta.json