diff --git a/code/game/objects/items/toys/balls_vr.dm b/code/game/objects/items/toys/balls_vr.dm
index 6c0b1c25a8..30f2c56d15 100644
--- a/code/game/objects/items/toys/balls_vr.dm
+++ b/code/game/objects/items/toys/balls_vr.dm
@@ -48,4 +48,23 @@
name = "purple tennis ball"
desc = "A purple tennis ball. Now you've seen everything. Purple, seriously?"
icon_state = "tennis_purple"
- item_state = "tennis_purple"
\ No newline at end of file
+ item_state = "tennis_purple"
+
+/obj/item/toy/baseball
+ name = "baseball"
+ desc = "A classic baseball; a rubber core surrounded by yarn and covered by faux leather. Getting hit with one is akin to getting punched."
+ icon = 'icons/obj/balls_vr.dmi'
+ icon_state = "baseball"
+ item_icons = list(
+ slot_l_hand_str = 'icons/mob/items/righthand_balls_vr.dmi',
+ slot_r_hand_str = 'icons/mob/items/lefthand_balls_vr.dmi',
+ slot_wear_mask_str = 'icons/mob/mouthball_vr.dmi',
+ )
+ item_state = "baseball"
+ slot_flags = SLOT_MASK
+ throw_range = 16
+ force = 2.0
+ throwforce = 5.0
+ throw_speed = 5
+ throw_range = 5
+ w_class = ITEMSIZE_SMALL
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 6fca46ba0f..c8b6c91840 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -23,6 +23,7 @@
var/hitcost = 240
var/use_external_power = FALSE //only used to determine if it's a cyborg baton
var/grip_safety = TRUE
+ var/taped_safety = FALSE
/obj/item/weapon/melee/baton/New()
..()
@@ -100,7 +101,7 @@
/obj/item/weapon/melee/baton/dropped()
..()
- if(status && grip_safety)
+ if(status && grip_safety && !taped_safety)
status = 0
visible_message("\The [src]'s grip safety engages!")
update_icon()
@@ -109,6 +110,8 @@
. = ..()
if(Adjacent(user))
+ if(taped_safety)
+ . += "Someone has wrapped tape around the grip!"
if(bcell)
. += "The baton is [round(bcell.percent())]% charged."
if(!bcell)
@@ -129,6 +132,17 @@
to_chat(user, "[src] already has a cell.")
else
to_chat(user, "This cell is not fitted for [src].")
+ if(istype(W, /obj/item/weapon/tape_roll) || istype(W, /obj/item/taperoll))
+ if(grip_safety && !taped_safety) //no point letting people wrap tape around the grips of batons without a safety
+ to_chat(user, "You firmly wrap tape around the baton's grip, disabling the safety system.")
+ playsound(src, 'sound/effects/tape.ogg',25)
+ taped_safety = TRUE
+ else if(grip_safety && taped_safety)
+ to_chat(user, "The grip safety has already been taped down.")
+ if(istype(W, /obj/item/weapon/tool/screwdriver))
+ if(taped_safety)
+ to_chat(user, "You painstakingly scrape away the tape over the grip safety.")
+ taped_safety = FALSE
/obj/item/weapon/melee/baton/attack_hand(mob/user as mob)
if(user.get_inactive_hand() == src)
diff --git a/code/game/objects/random/maintenance.dm b/code/game/objects/random/maintenance.dm
index a6bc8c7d34..56366d7cdd 100644
--- a/code/game/objects/random/maintenance.dm
+++ b/code/game/objects/random/maintenance.dm
@@ -111,6 +111,7 @@ something, make sure it's not in one of the other lists.*/
prob(2);/obj/item/toy/tennis/cyan,
prob(2);/obj/item/toy/tennis/blue,
prob(2);/obj/item/toy/tennis/purple,
+ prob(1);/obj/item/toy/baseball,
prob(1);/obj/item/pizzavoucher
/* VOREStation Edit End */
)
diff --git a/code/game/objects/random/mapping_vr.dm b/code/game/objects/random/mapping_vr.dm
index 3075c40415..732d614601 100644
--- a/code/game/objects/random/mapping_vr.dm
+++ b/code/game/objects/random/mapping_vr.dm
@@ -156,5 +156,6 @@
prob(2);/obj/item/toy/tennis/blue,
prob(2);/obj/item/toy/tennis/purple,
prob(2);/obj/item/clothing/ears/earmuffs,
- prob(2);/obj/item/clothing/ears/earmuffs/headphones
+ prob(2);/obj/item/clothing/ears/earmuffs/headphones,
+ prob(2);/obj/item/toy/baseball
)
\ No newline at end of file
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 55ee4ac69d..23443a8f80 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,15 +145,10 @@
/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,
-<<<<<<< HEAD
- /obj/item/clothing/suit/neo_armsco_trench,
- /obj/item/clothing/suit/neo_warden_heavy,
-=======
/obj/item/clothing/suit/storage/vest/wardencoat/neo_armsco_trench,
/obj/item/clothing/suit/storage/vest/wardencoat/neo_bluewarden,
/obj/item/clothing/suit/storage/vest/wardencoat/neo_warden_heavy,
/obj/item/clothing/under/rank/neo_sec_gorka,
->>>>>>> 236fb54ed4... Merge pull request #14893 from KillianKirilenko/kk-nanofix
/obj/item/weapon/cartridge/security,
/obj/item/device/radio/headset/headset_sec,
/obj/item/device/radio/headset/headset_sec/alt,
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 d1abd9ecc0..2cb1a3bbfe 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/suit/storage/vest/wardencoat/neo_armsco_trench,
diff --git a/code/game/objects/structures/trash_pile_vr.dm b/code/game/objects/structures/trash_pile_vr.dm
index fe4cee1da3..91f3e77da1 100644
--- a/code/game/objects/structures/trash_pile_vr.dm
+++ b/code/game/objects/structures/trash_pile_vr.dm
@@ -250,6 +250,7 @@
prob(2);/obj/item/toy/tennis/cyan,
prob(2);/obj/item/toy/tennis/blue,
prob(2);/obj/item/toy/tennis/purple,
+ prob(1);/obj/item/toy/baseball,
prob(1);/obj/item/weapon/storage/box/brainzsnax,
prob(1);/obj/item/weapon/storage/box/brainzsnax/red,
prob(1);/obj/item/clothing/glasses/sunglasses,
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index d3bef86d72..d0ce7f34db 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -315,6 +315,26 @@
..()
gear_tweaks += gear_tweak_free_color_choice
+/datum/gear/suit/ranger_poncho
+ display_name = "ranger poncho selection"
+ path = /obj/item/clothing/accessory/poncho/roles/ranger
+ cost = 1
+
+/datum/gear/suit/ranger_poncho/New()
+ ..()
+ var/list/ranger_ponchos = list(
+ "red ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger,
+ "tan ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/tan,
+ "gray ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/gray,
+ "green ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/green,
+ "blue ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/blue,
+ "purple ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/purple,
+ "orange ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/orange,
+ "charcoal ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/charcoal,
+ "white ranger poncho" = /obj/item/clothing/accessory/poncho/roles/ranger/snow
+ )
+ gear_tweaks += new/datum/gear_tweak/path(ranger_ponchos)
+
/datum/gear/suit/unathi_robe
display_name = "roughspun robe"
path = /obj/item/clothing/suit/unathi/robe
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 87341fd9f3..3d3bafeab9 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -622,3 +622,51 @@
/obj/item/clothing/accessory/pride/vore
name = "vore pride pin"
icon_state = "pride_vore"
+
+// ranger ponchos
+
+/obj/item/clothing/accessory/poncho/roles/ranger
+ name = "red ranger poncho"
+ desc = "A rugged all-weather poncho, perfectly coloured to match a popular line of neck gaiters. You could probably use it as a tent in a pinch!"
+ icon_state = "rangerponcho_red"
+ item_state = "rangerponcho_red"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/tan
+ name = "tan ranger poncho"
+ icon_state = "rangerponcho_tan"
+ item_state = "rangerponcho_tan"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/gray
+ name = "gray ranger poncho"
+ icon_state = "rangerponcho_gray"
+ item_state = "rangerponcho_gray"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/green
+ name = "green ranger poncho"
+ icon_state = "rangerponcho_green"
+ item_state = "rangerponcho_green"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/blue
+ name = "blue ranger poncho"
+ icon_state = "rangerponcho_blue"
+ item_state = "rangerponcho_blue"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/purple
+ name = "purple ranger poncho"
+ icon_state = "rangerponcho_purple"
+ item_state = "rangerponcho_purple"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/orange
+ name = "orange ranger poncho"
+ icon_state = "rangerponcho_orange"
+ item_state = "rangerponcho_orange"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/charcoal
+ name = "charcoal ranger poncho"
+ icon_state = "rangerponcho_charcoal"
+ item_state = "rangerponcho_charcoal"
+
+/obj/item/clothing/accessory/poncho/roles/ranger/snow
+ name = "white ranger poncho"
+ icon_state = "rangerponcho_snow"
+ item_state = "rangerponcho_snow"
\ No newline at end of file
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..603f205055 100644
--- a/code/modules/economy/vending_machines.dm
+++ b/code/modules/economy/vending_machines.dm
@@ -301,7 +301,7 @@
/obj/item/toy/tennis = 15)
//VOREStation Edit End
- contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake = 2) // VOREStation Add - Slurpable blobs.
+ contraband = list(/obj/item/weapon/reagent_containers/syringe/steroid = 4, /obj/item/weapon/reagent_containers/food/drinks/glass2/fitnessflask/proteanshake = 2, /obj/item/toy/baseball = 2) // VOREStation Add - Slurpable blobs.
/obj/machinery/vending/cart
name = "PTech"
@@ -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/code/modules/mob/living/silicon/robot/robot_modules/Widerobot_Command_ch.dm b/code/modules/mob/living/silicon/robot/robot_modules/Widerobot_Command_ch.dm
index 0ae422564d..91e49c2b5f 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/Widerobot_Command_ch.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/Widerobot_Command_ch.dm
@@ -36,7 +36,8 @@
name = "Unity Hound Module"
sprites = list(
"Kcom" = "kcom",
- "Raptor V-4.1" = "chraptor"
+ "Raptor V-4.1" = "chraptor",
+ "Borgi" = "borgi"
)
channels = list(
"Medical" = 1,
diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
index b0662f3087..6ace493a92 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
@@ -940,6 +940,7 @@
"KMine" = "kmine",
"CargoHound" = "cargohound",
"CargoHoundDark" = "cargohounddark",
+ "Borgi" = "borgi-mine", //CHOMPEdit
"Cat Mining" = "vixmine", //CHOMPEdit
"Cat Cargo" = "vixcargo", //CHOMPEdit
"Drake" = "drakemine",
@@ -980,8 +981,8 @@
B.water = water
src.modules += B
- R.icon = 'icons/mob/widerobot_car_vr.dmi'
- R.wideborg_dept = 'icons/mob/widerobot_car_vr.dmi'
+ R.icon = 'modular_chomp/icons/mob/widerobot_car_ch.dmi' //CHOMPEdit
+ R.wideborg_dept = 'modular_chomp/icons/mob/widerobot_car_ch.dmi' //CHOMPEdit
R.hands.icon = 'icons/mob/screen1_robot_vr.dmi'
R.ui_style_vr = TRUE
R.pixel_x = -16
diff --git a/icons/inventory/accessory/item.dmi b/icons/inventory/accessory/item.dmi
index b17ed5c1e2..568c866874 100644
Binary files a/icons/inventory/accessory/item.dmi and b/icons/inventory/accessory/item.dmi differ
diff --git a/icons/inventory/accessory/mob.dmi b/icons/inventory/accessory/mob.dmi
index 8858b2f580..b5bb6eff55 100644
Binary files a/icons/inventory/accessory/mob.dmi and b/icons/inventory/accessory/mob.dmi differ
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
diff --git a/icons/mob/items/lefthand_balls_vr.dmi b/icons/mob/items/lefthand_balls_vr.dmi
index 70455d01c2..9c34b823a5 100644
Binary files a/icons/mob/items/lefthand_balls_vr.dmi and b/icons/mob/items/lefthand_balls_vr.dmi differ
diff --git a/icons/mob/items/righthand_balls_vr.dmi b/icons/mob/items/righthand_balls_vr.dmi
index 286540595d..c1030a143c 100644
Binary files a/icons/mob/items/righthand_balls_vr.dmi and b/icons/mob/items/righthand_balls_vr.dmi differ
diff --git a/icons/mob/mouthball_vr.dmi b/icons/mob/mouthball_vr.dmi
index f3c605ab56..3fb8a22820 100644
Binary files a/icons/mob/mouthball_vr.dmi and b/icons/mob/mouthball_vr.dmi differ
diff --git a/icons/obj/balls_vr.dmi b/icons/obj/balls_vr.dmi
index e85f4cab05..6900c2df12 100644
Binary files a/icons/obj/balls_vr.dmi and b/icons/obj/balls_vr.dmi differ
diff --git a/modular_chomp/icons/mob/widerobot_car_ch.dmi b/modular_chomp/icons/mob/widerobot_car_ch.dmi
new file mode 100644
index 0000000000..9a53b30d94
Binary files /dev/null and b/modular_chomp/icons/mob/widerobot_car_ch.dmi differ
diff --git a/modular_chomp/icons/mob/widerobot_ch.dmi b/modular_chomp/icons/mob/widerobot_ch.dmi
index 48e9872039..895a4dc0ae 100644
Binary files a/modular_chomp/icons/mob/widerobot_ch.dmi and b/modular_chomp/icons/mob/widerobot_ch.dmi differ