diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 68c0eba105..b772ce52e3 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -13,6 +13,7 @@ /obj/item/clothing/under/rank/chief_engineer/skirt, /obj/item/clothing/under/rank/neo_chiefengi, /obj/item/clothing/under/rank/neo_chiefengi_skirt, + /obj/item/clothing/under/rank/neo_ce_gorka, /obj/item/clothing/head/hardhat/white, ///obj/item/clothing/head/welding, //VOREStation Removal: Locker bloat, grr. They get fancy goggles or can raid the welding supplies locker for one of these. /obj/item/clothing/gloves/heavy_engineer, //VOREStation Edit: chief gets the good shit diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 9a64aa8df2..c217ce9f4a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -140,6 +140,7 @@ /obj/item/clothing/under/rank/neo_cmo_skirt, /obj/item/clothing/under/rank/neo_cmo_turtle, /obj/item/clothing/under/rank/neo_cmo_turtle_skirt, + /obj/item/clothing/under/rank/neo_cmo_gorka, /obj/item/device/radio/headset/heads/cmo, /obj/item/device/radio/headset/heads/cmo/alt, /obj/item/device/flash, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index 0acf27a536..81f2911baa 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -39,6 +39,7 @@ /obj/item/clothing/under/rank/neo_rd_turtle_skirt, /obj/item/clothing/under/rank/neo_rd_suit, /obj/item/clothing/under/rank/neo_rd_suit_skirt, + /obj/item/clothing/under/rank/neo_rd_gorka, /obj/item/weapon/cartridge/rd, /obj/item/clothing/shoes/white, /obj/item/clothing/shoes/laceup/brown, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 11ea7b6898..30525d625d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -55,6 +55,7 @@ /obj/item/clothing/under/rank/neo_hop_parade_fem, /obj/item/clothing/under/rank/neo_hop_turtle, /obj/item/clothing/under/rank/neo_hop_turtle_skirt, + /obj/item/clothing/under/rank/neo_cmd_gorka, /obj/item/clothing/suit/storage/toggle/labcoat/neo_hopformal, /obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep, /obj/item/clothing/shoes/brown, @@ -144,6 +145,7 @@ /obj/item/clothing/under/rank/neo_warden_red, /obj/item/clothing/under/rank/neo_warden_red_skirt, /obj/item/clothing/under/rank/neo_warden_blue, + /obj/item/clothing/under/rank/neo_sec_gorka, /obj/item/clothing/suit/neo_armsco_trench, /obj/item/clothing/suit/neo_warden_heavy, /obj/item/weapon/cartridge/security, diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm index e19c76070c..60dc89c33a 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security_vr.dm @@ -24,6 +24,7 @@ /obj/item/clothing/under/rank/neo_hos_blackblue_skirt, /obj/item/clothing/under/rank/neo_hos_parade_blue, /obj/item/clothing/under/rank/neo_hos_parade_blue_fem, + /obj/item/clothing/under/rank/neo_hos_gorka, /obj/item/clothing/suit/storage/toggle/labcoat/neo_hos_parade, /obj/item/clothing/suit/storage/toggle/labcoat/neo_hosformal_blue, /obj/item/clothing/head/helmet/HoS/hat/blue, diff --git a/code/modules/clothing/under/neounder.dm b/code/modules/clothing/under/neounder.dm index 2e0c9ae1dc..59a939987e 100644 --- a/code/modules/clothing/under/neounder.dm +++ b/code/modules/clothing/under/neounder.dm @@ -95,6 +95,13 @@ this file deals with uniforms/under. */ rolled_sleeves = -1 rolled_down = -1 +/obj/item/clothing/under/rank/neo_civvie_gorka + name = "civilan gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. For those who appreciate durable clothing. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_civvie_gorka" + rolled_sleeves = -1 + rolled_down = -1 + // Command /obj/item/clothing/under/rank/neo_captain @@ -195,6 +202,20 @@ this file deals with uniforms/under. */ rolled_sleeves = -1 rolled_down = -1 +/obj/item/clothing/under/rank/neo_cmd_gorka + name = "CO's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. Who said command-wear can't look slick? It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_cmd_gorka" + rolled_sleeves = -1 + rolled_down = -1 + +/obj/item/clothing/under/rank/neo_pilot_gorka + name = "pilot's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. In the pipe, five by five. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_pilot_gorka" + rolled_sleeves = -1 + rolled_down = -1 + //'Suspicious' /obj/item/clothing/under/rank/neo_suspect_turtleneck @@ -572,6 +593,26 @@ this file deals with uniforms/under. */ icon_state = "neo_runner" rolled_sleeves = -1 rolled_down = -1 + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + siemens_coefficient = 0.9 + +/obj/item/clothing/under/rank/neo_hos_gorka + name = "head of security's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. Favoured by the Head of Security who wants to stay dry no matter what. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_hos_gorka" + rolled_sleeves = -1 + rolled_down = -1 + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + siemens_coefficient = 0.9 + +/obj/item/clothing/under/rank/neo_sec_gorka + name = "security officer's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. For officers who expect to be patrolling in harsh conditions. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_sec_gorka" + rolled_sleeves = -1 + rolled_down = -1 + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) + siemens_coefficient = 0.9 // Cargo @@ -655,7 +696,7 @@ this file deals with uniforms/under. */ /obj/item/clothing/under/rank/neo_qm_gorka name = "QM's gorka" - desc = "it has a tag denoting it's made by Total Gear & Co." + desc = "A rugged weather-resistant uniform made of ripstop fabric. Preferred by quartermasters who do heavy lifting as well as paperwork. It has a tag denoting it's made by Total Gear & Co." icon_state = "neo_qm_gorka" rolled_sleeves = -1 rolled_down = -1 @@ -704,7 +745,7 @@ this file deals with uniforms/under. */ /obj/item/clothing/under/rank/neo_cargo_gorka name = "cargo tech's gorka" - desc = "it has a tag denoting it's made by Total Gear & Co." + desc = "A rugged weather-resistant uniform made of ripstop fabric. No need to worry about improperly packaged goods ripping your jumpsuit with this. It has a tag denoting it's made by Total Gear & Co." icon_state = "neo_cargo_gorka" rolled_sleeves = -1 rolled_down = -1 @@ -765,6 +806,22 @@ this file deals with uniforms/under. */ rolled_down = -1 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) +/obj/item/clothing/under/rank/neo_ce_gorka + name = "chief engineer's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. For the chief engineer who values style and safety. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_ce_gorka" + rolled_sleeves = -1 + rolled_down = -1 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) + +/obj/item/clothing/under/rank/neo_engi_gorka + name = "engineer's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. Not rated for high-power electrical shocks. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_engi_gorka" + rolled_sleeves = -1 + rolled_down = -1 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 10) + // Sci /obj/item/clothing/under/rank/neo_rd_turtle @@ -844,6 +901,20 @@ this file deals with uniforms/under. */ rolled_sleeves = -1 rolled_down = -1 +/obj/item/clothing/under/rank/neo_rd_gorka + name = "research director's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. For research directors who like to get their hands dirty. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_rd_gorka" + rolled_sleeves = -1 + rolled_down = -1 + +/obj/item/clothing/under/rank/neo_sci_gorka + name = "scientist's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. A favourite of mountaineering archaeologists. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_sci_gorka" + rolled_sleeves = -1 + rolled_down = -1 + // Med /obj/item/clothing/under/rank/neo_med @@ -1007,3 +1078,21 @@ this file deals with uniforms/under. */ rolled_down = -1 permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) + +/obj/item/clothing/under/rank/neo_cmo_gorka + name = "chief medical officer's gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. Why worry about stains when everything slides right off? It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_cmo_gorka" + rolled_sleeves = -1 + rolled_down = -1 + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) + +/obj/item/clothing/under/rank/neo_med_gorka + name = "medical staff gorka" + desc = "A rugged weather-resistant uniform made of ripstop fabric. A popular choice among paramedical personnel. It has a tag denoting it's made by Total Gear & Co." + icon_state = "neo_med_gorka" + rolled_sleeves = -1 + rolled_down = -1 + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) diff --git a/code/modules/economy/vending_machines.dm b/code/modules/economy/vending_machines.dm index ea8b0b30ef..1c44756f87 100644 --- a/code/modules/economy/vending_machines.dm +++ b/code/modules/economy/vending_machines.dm @@ -1237,6 +1237,7 @@ /obj/item/clothing/under/rank/neo_corrections = 5, /obj/item/clothing/under/rank/neo_corrections_skirt = 5, /obj/item/clothing/under/rank/neo_runner = 5, + /obj/item/clothing/under/rank/neo_sec_gorka = 5, /obj/item/clothing/suit/neo_runner_coat = 5, /obj/item/clothing/shoes/boots/jackboots/silver = 5, /obj/item/clothing/shoes/boots/jackboots/white = 5, @@ -1304,6 +1305,7 @@ /obj/item/clothing/under/rank/neo_para_light_skirt = 5, /obj/item/clothing/under/rank/neo_med_dark = 5, /obj/item/clothing/under/rank/neo_med_dark_skirt = 5, + /obj/item/clothing/under/rank/neo_med_gorka = 5, /obj/item/clothing/suit/storage/toggle/labcoat/neo_emt = 5, /obj/item/clothing/suit/storage/toggle/labcoat/neo_labcoat = 5, /obj/item/clothing/suit/storage/toggle/labcoat/neo_highvis = 5, @@ -1410,6 +1412,7 @@ /obj/item/clothing/under/rank/neo_science = 5, /obj/item/clothing/under/rank/neo_science_skirt = 5, /obj/item/clothing/under/rank/neo_util_sci = 5, + /obj/item/clothing/under/rank/neo_sci_gorka = 5, /obj/item/clothing/suit/storage/toggle/labcoat/neo_sci_dep = 5, /obj/item/clothing/suit/storage/toggle/labcoat/neo_labcoat = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/science = 5, @@ -1490,6 +1493,7 @@ /obj/item/clothing/mask/bandana/gold = 5, /obj/item/clothing/under/rank/neo_engi = 5, /obj/item/clothing/under/rank/neo_engi_skirt = 5, + /obj/item/clothing/under/rank/neo_engi_gorka = 5, /obj/item/clothing/suit/storage/toggle/labcoat/neo_engi_dep = 5, /obj/item/clothing/suit/storage/hooded/wintercoat/engineering = 5, /obj/item/clothing/shoes/boots/winter/engineering = 5, diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index fc71f80711..672b8ca44f 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -930,6 +930,7 @@ /obj/item/clothing/under/suit_jacket/checkered/skirt = 5, /obj/item/clothing/under/suit_jacket/tan = 5, /obj/item/clothing/under/suit_jacket/tan/skirt = 5, + /obj/item/clothing/under/rank/neo_civvie_gorka = 5, /obj/item/clothing/suit/storage/toggle/labcoat/neo_leather = 5, /obj/item/clothing/suit/neo_gorka = 5, /obj/item/clothing/suit/storage/toggle/labcoat/neo_civ_dep = 5, diff --git a/icons/inventory/uniform/item.dmi b/icons/inventory/uniform/item.dmi index 1e765777c7..0cc9ef154a 100644 Binary files a/icons/inventory/uniform/item.dmi and b/icons/inventory/uniform/item.dmi differ diff --git a/icons/inventory/uniform/mob.dmi b/icons/inventory/uniform/mob.dmi index 2c66bcf61a..5d36de239b 100644 Binary files a/icons/inventory/uniform/mob.dmi and b/icons/inventory/uniform/mob.dmi differ