diff --git a/code/game/objects/items/weapons/melee/energy_vr.dm b/code/game/objects/items/weapons/melee/energy_vr.dm index 1d188d03ca..62f3201619 100644 --- a/code/game/objects/items/weapons/melee/energy_vr.dm +++ b/code/game/objects/items/weapons/melee/energy_vr.dm @@ -5,4 +5,21 @@ icon = 'icons/obj/weapons_vr.dmi' item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi') colorable = FALSE - lcolor = "#FFFFFF" \ No newline at end of file + lcolor = "#FFFFFF" + +/obj/item/weapon/melee/energy/sword/altevian + name = "plasma blade cutter" + desc = "A device used as both defense and operational purposes to cut through most metals. This is usually seen on engineers from the altevian hegemony when working salvaging derelicts." + icon_state = "altevian-cutter" + item_state = "altevian-cutter" + icon = 'icons/obj/weapons_vr.dmi' + item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi') + colorable = FALSE + lcolor = "#FFFFFF" + +/obj/item/weapon/melee/energy/sword/altevian/update_icon() + ..() + if(active) + icon_state = "[initial(icon_state)]_active" + else + icon_state = initial(icon_state) \ No newline at end of file diff --git a/code/game/objects/items/weapons/melee/misc_vr.dm b/code/game/objects/items/weapons/melee/misc_vr.dm index b14a36e1f4..d06c4b82bf 100644 --- a/code/game/objects/items/weapons/melee/misc_vr.dm +++ b/code/game/objects/items/weapons/melee/misc_vr.dm @@ -13,4 +13,22 @@ sharp = TRUE edge = FALSE attack_verb = list("stabbed", "lunged at", "dextrously struck", "sliced", "lacerated", "impaled", "diced", "charioted") - hitsound = 'sound/weapons/bladeslice.ogg' \ No newline at end of file + hitsound = 'sound/weapons/bladeslice.ogg' + +/obj/item/weapon/melee/altevian_wrench + name = "Hull Systems Multi-Wrench" + desc = "A wrench designed with a method to help secure and access bolts, hatches, and airlocks on altevian designed vessels. This operates as nothing more than a massive wrench when used for other purposes." + icon = 'icons/obj/weapons_vr.dmi' + icon_state = "altevian-wrench" + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_melee_vr.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_melee_vr.dmi', + ) + slot_flags = SLOT_BACK + force = 25 + throwforce = 15 + w_class = ITEMSIZE_HUGE + sharp = FALSE + edge = FALSE + attack_verb = list("whacked", "slammed", "bashed", "wrenched", "fixed", "bolted", "clonked", "bonked") + hitsound = 'sound/weapons/smash.ogg' \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm index 9e4a87cb6d..f014232fe3 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno_vr.dm @@ -86,6 +86,23 @@ //whitelisted = SPECIES_TAJ sort_category = "Xenowear" +/datum/gear/mask/altevian_breath + display_name = "spacer tuned mask (Altevian)" + path = /obj/item/clothing/mask/altevian_breath + sort_category = "Xenowear" + +/datum/gear/uniform/altevian_outfit + description = "A uniform commonly seen from altevians during their work. The material on this uniform seems to be made of durable thread that can handle the stress of most matters of labor." + display_name = "altevian duty jumpsuit selection (Altevian)" + sort_category = "Xenowear" + +/datum/gear/uniform/altevian_outfit/New() + ..() + var/list/pants = list() + for(var/obj/item/clothing/under/altevian/uniform_type as anything in typesof(/obj/item/clothing/under/altevian)) + pants[initial(uniform_type.name)] = uniform_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) + // Taur stuff /datum/gear/suit/taur/drake_cloak display_name = "drake cloak (Drake-taur)" diff --git a/code/modules/clothing/masks/breath_vr.dm b/code/modules/clothing/masks/breath_vr.dm index 47c5fdb64b..706371a67a 100644 --- a/code/modules/clothing/masks/breath_vr.dm +++ b/code/modules/clothing/masks/breath_vr.dm @@ -2,3 +2,20 @@ name = "transparent breath mask" item_state = "golem" //This is dumb and hacky but was here when I got here. sprite_sheets = null + +/obj/item/clothing/mask/altevian_breath + name = "Spacer Tuned Mask" + desc = "A mask designed for long-term use in areas where breathing comes at a premium." + icon_state = "altevian-mask" + icon = 'icons/inventory/face/item_vr.dmi' + icon_override = 'icons/inventory/face/mob_vr.dmi' + sprite_sheets = null + item_state_slots = list(slot_r_hand_str = "breath", slot_l_hand_str = "breath") + item_flags = AIRTIGHT|FLEXIBLEMATERIAL + body_parts_covered = FACE + w_class = ITEMSIZE_SMALL + gas_transfer_coefficient = 0.10 + permeability_coefficient = 0.50 + species_restricted = list(SPECIES_ALTEVIAN) + pickup_sound = 'sound/items/pickup/component.ogg' + drop_sound = 'sound/items/drop/component.ogg' diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index dd8e8fce2c..e62e53e7f3 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -88,11 +88,11 @@ /obj/item/clothing/suit/space/void/hev name = "hazardous environment suit" desc = "Has a strange smell to it, but you feel like it might be an old friend." - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "hev_orange" - + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM @@ -103,11 +103,11 @@ /obj/item/clothing/head/helmet/space/void/hev name = "hazardous environment helmet" desc = "Has a strange smell to it, but you feel like it might be an old friend." - + icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "hev_orange" - + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM @@ -119,11 +119,11 @@ /obj/item/clothing/suit/space/void/makeshift name = "makeshift voidsuit" desc = "This is not something you should use if you have other options, but it's better than nothing!" - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "makeshift_void" - + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0) sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB @@ -132,7 +132,7 @@ /obj/item/clothing/head/helmet/space/void/makeshift name = "makeshift voidsuit helmet" desc = "This is not something you should use if you have other options, but it's better than nothing!" - + icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "makeshift_void" @@ -146,26 +146,26 @@ /obj/item/clothing/suit/space/void/custodian name = "custodian suit" desc = "Vacuum-capable armor for a Custodian to do their duty." - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "custodian" armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20) - + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/custodian name = "custodian helmet" desc = "Vacuum-capable helmet for a Custodian to do their duty." - + icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "custodian" armor = list("melee" = 70, "bullet" = 70, "laser" = 70, "energy" = 50, "bomb" = 40, "bio" = 0, "rad" = 20) - + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM @@ -173,7 +173,7 @@ /obj/item/clothing/suit/space/void/aether name = "\improper Aether voidsuit" desc = "This suit seems rather high-end for a standard voidsuit. The air in it has a hint of 'new car smell', courtesy of Aether Atmospherics." - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "moebiussuit" @@ -186,7 +186,7 @@ /obj/item/clothing/head/helmet/space/void/aether name = "\improper Aether voidsuit helmet" desc = "Aether Atmospherics thought that giving this helmet selectable colored lighting would improve market penetration. Very comfortable, regardless." - + icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "moebiushelm_White" @@ -212,21 +212,49 @@ /obj/item/clothing/suit/space/void/excelsior name = "\improper Excelsior voidsuit" desc = "A space suit from a particular spaceship: Excelsior." - + icon = 'icons/inventory/suit/item_vr.dmi' default_worn_icon = 'icons/inventory/suit/mob_vr.dmi' icon_state = "excelsior" - + sprite_sheets = ALL_VR_SPRITE_SHEETS_SUIT_MOB sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_SUIT_ITEM /obj/item/clothing/head/helmet/space/void/excelsior name = "\improper Excelsior voidsuit helmet" desc = "A space helmet from a particular spaceship: Excelsior." - + icon = 'icons/inventory/head/item_vr.dmi' default_worn_icon = 'icons/inventory/head/mob_vr.dmi' icon_state = "excelsior" - + sprite_sheets = ALL_VR_SPRITE_SHEETS_HEAD_MOB sprite_sheets_obj = ALL_VR_SPRITE_SHEETS_HEAD_ITEM + + +/obj/item/clothing/suit/space/void/altevian_heartbreaker + name = "\improper heartbreaker voidsuit" + desc = "The altevians' newest iteration of their armored suits. This one is tailored for zero-g environments, and while it can function in an area with gravity, it'll put a strain on even the most athletic of individuals." + + icon = 'icons/inventory/suit/item_vr_altevian.dmi' + default_worn_icon = 'icons/inventory/suit/mob_vr_altevian.dmi' + icon_state = "rig-heartbreaker" + + armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 80) + + species_restricted = list(SPECIES_ALTEVIAN) + no_cycle = TRUE + slowdown = 2.5 + +/obj/item/clothing/head/helmet/space/void/altevian_heartbreaker + name = "\improper heartbreaker helmet" + desc = "The altevians' newest iteration of their armored suits. This one is tailored for zero-g environments, and while it can function in an area with gravity, it'll put a strain on even the most athletic of individuals." + + icon = 'icons/inventory/head/item_vr_altevian.dmi' + default_worn_icon = 'icons/inventory/head/mob_vr_altevian.dmi' + icon_state = "rig0-heartbreaker" + + armor = list("melee" = 90, "bullet" = 90, "laser" = 90, "energy" = 90, "bomb" = 90, "bio" = 100, "rad" = 80) + + species_restricted = list(SPECIES_ALTEVIAN) + no_cycle = TRUE diff --git a/code/modules/clothing/under/altevian_vr.dm b/code/modules/clothing/under/altevian_vr.dm index 51f3bbef3b..89c44205f9 100644 --- a/code/modules/clothing/under/altevian_vr.dm +++ b/code/modules/clothing/under/altevian_vr.dm @@ -44,3 +44,32 @@ icon_state = "altevian-pants-cargo" worn_state = "altevian-pants-cargo" starting_accessories = list(/obj/item/clothing/accessory/jacket/altevian/cargo) + +/obj/item/clothing/under/altevian + name = "Altevian Duty Jumpsuit" + desc = "A uniform commonly seen from altevians during their work. The material on this uniform seems to be made of durable thread that can handle the stress of most matters of labor." + icon = 'icons/inventory/uniform/item_vr.dmi' + icon_override = 'icons/inventory/uniform/mob_vr.dmi' + icon_state = "altevian-specialist" + worn_state = "altevian-specialist" + species_restricted = list(SPECIES_ALTEVIAN) + +/obj/item/clothing/under/altevian/sci + name = "Altevian Science Duty Jumpsuit" + icon_state = "altevian-specialist-sci" + worn_state = "altevian-specialist-sci" + +/obj/item/clothing/under/altevian/med + name = "Altevian Medical Duty Jumpsuit" + icon_state = "altevian-specialist-med" + worn_state = "altevian-specialist-med" + +/obj/item/clothing/under/altevian/sec + name = "Altevian Security Duty Jumpsuit" + icon_state = "altevian-specialist-sec" + worn_state = "altevian-specialist-sec" + +/obj/item/clothing/under/altevian/eng + name = "Altevian Engineering Duty Jumpsuit" + icon_state = "altevian-specialist-eng" + worn_state = "altevian-specialist-eng" \ No newline at end of file diff --git a/code/modules/events/event_container_vr.dm b/code/modules/events/event_container_vr.dm index 6c1eea9d60..b2354f2ce6 100644 --- a/code/modules/events/event_container_vr.dm +++ b/code/modules/events/event_container_vr.dm @@ -97,6 +97,7 @@ new /datum/event_meta(EVENT_LEVEL_MODERATE, "Virology Breach", /datum/event/prison_break/virology, 0, list(ASSIGNMENT_MEDICAL = 100), 1, min_jobs = list(ASSIGNMENT_MEDICAL = 1)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Xenobiology Breach", /datum/event/prison_break/xenobiology, 0, list(ASSIGNMENT_SCIENCE = 100), 1, min_jobs = list(ASSIGNMENT_SCIENTIST = 1), min_jobs = list(ASSIGNMENT_SCIENTIST = 1, ASSIGNMENT_SECURITY =1)), new /datum/event_meta(EVENT_LEVEL_MODERATE, "Jellyfish School", /datum/event/jellyfish_migration, 5, list(ASSIGNMENT_ANY = 1, ASSIGNMENT_SECURITY = 5, ASSIGNMENT_MEDICAL = 3), 1), + new /datum/event_meta(EVENT_LEVEL_MODERATE, "Wormholes", /datum/event/wormholes, 5, list(ASSIGNMENT_ANY = 5), 1), ) add_disabled_events(list( new /datum/event_meta(EVENT_LEVEL_MODERATE, "Meteor Shower", /datum/event/meteor_wave, 30, list(ASSIGNMENT_ENGINEER = 20), min_jobs = list(ASSIGNMENT_ENGINEER = 3)), diff --git a/code/modules/projectiles/guns/energy/altevian_vr.dm b/code/modules/projectiles/guns/energy/altevian_vr.dm new file mode 100644 index 0000000000..150d05c421 --- /dev/null +++ b/code/modules/projectiles/guns/energy/altevian_vr.dm @@ -0,0 +1,59 @@ +/obj/item/weapon/gun/energy/altevian + name = "Magneto-Electric Energy Projector" + desc = "A hand-held version of an energy weapon for the Altevian Hegemony. This one seems to be made for more proper civilian use with its reduced charge capacity, but ease of handling." + icon_state = "meep" + item_state = "meep" + fire_delay = 8 + slot_flags = SLOT_BELT + w_class = ITEMSIZE_NORMAL + force = 5 + origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 2) + matter = list(MAT_STEEL = 1000) + projectile_type = /obj/item/projectile/beam/meeplaser + charge_cost = 150 + +/obj/item/weapon/gun/energy/altevian/large + name = "Proto-Reactive Beam Thruster" + desc = "A standard issue energy rifle seen for defensive purposes for a space faring rodent species. The beams are tuned for proper suppression." + icon_state = "altevian-pdw" + item_state = "altevian-pdw" + slot_flags = SLOT_BELT + w_class = ITEMSIZE_LARGE + force = 10 + origin_tech = list(TECH_COMBAT = 3, TECH_MAGNET = 4) + matter = list(MAT_STEEL = 2000) + projectile_type = /obj/item/projectile/beam/meeplaser/strong + charge_cost = 300 + +/obj/item/projectile/beam/meeplaser + name = "meep beam" + icon_state = "meep" + damage = 15 + light_color = "#77A6E1" + hud_state = "laser_disabler" + + muzzle_type = /obj/effect/projectile/muzzle/meeplaser + tracer_type = /obj/effect/projectile/tracer/meeplaser + impact_type = /obj/effect/projectile/impact/meeplaser + +/obj/item/projectile/beam/meeplaser/strong + name = "repeater beam" + damage = 35 + +/obj/effect/projectile/muzzle/meeplaser + icon_state = "muzzle_meep" + light_range = 2 + light_power = 0.5 + light_color = "#77A6E1" + +/obj/effect/projectile/tracer/meeplaser + icon_state = "meep" + light_range = 2 + light_power = 0.5 + light_color = "#77A6E1" + +/obj/effect/projectile/impact/meeplaser + icon_state = "impact_meep" + light_range = 2 + light_power = 0.5 + light_color = "#77A6E1" \ No newline at end of file diff --git a/code/modules/projectiles/guns/projectile/altevian_vr.dm b/code/modules/projectiles/guns/projectile/altevian_vr.dm new file mode 100644 index 0000000000..29d4800fcd --- /dev/null +++ b/code/modules/projectiles/guns/projectile/altevian_vr.dm @@ -0,0 +1,39 @@ +/obj/item/weapon/gun/projectile/altevian + name = "Altevian Rivet Repeater" + desc = "An offensive weapon designed by the altevians that is used for decompression and maximizes structural damage while also serving as a good method of personnel damage." + magazine_type = /obj/item/ammo_magazine/sam48 + allowed_magazines = list(/obj/item/ammo_magazine/sam48) + projectile_type = /obj/item/projectile/bullet/sam48 + icon_state = "altevian-repeater" + item_state = "altevian-repeater" + caliber = ".48" + load_method = MAGAZINE + +/obj/item/weapon/gun/projectile/altevian/update_icon() + if(ammo_magazine) + icon_state = initial(icon_state) + else + icon_state = "[initial(icon_state)]-e" + +/obj/item/ammo_magazine/sam48 + name = "ammo clip (SAM .48)" + icon_state = "sam48" + desc = "Standard Altevian Munition clip, caliber .48." + caliber = ".48" + ammo_type = /obj/item/ammo_casing/sam48 + mag_type = MAGAZINE + matter = list(MAT_STEEL = 240) + max_ammo = 5 + multiple_sprites = 1 + +/obj/item/ammo_casing/sam48 + desc = "A .48 bolt casing." + caliber = ".48" + projectile_type = /obj/item/projectile/bullet/sam48 + matter = list(MAT_STEEL = 30) + +/obj/item/projectile/bullet/sam48 + fire_sound = 'sound/weapons/gunshot4.ogg' + icon_state = "sam48" + damage = 49 + hud_state = "pistol_special" diff --git a/icons/inventory/back/mob.dmi b/icons/inventory/back/mob.dmi index 0d98a933c9..3789379b86 100644 Binary files a/icons/inventory/back/mob.dmi and b/icons/inventory/back/mob.dmi differ diff --git a/icons/inventory/face/item_vr.dmi b/icons/inventory/face/item_vr.dmi index cc2396d299..c621b7dadd 100644 Binary files a/icons/inventory/face/item_vr.dmi and b/icons/inventory/face/item_vr.dmi differ diff --git a/icons/inventory/face/mob_vr.dmi b/icons/inventory/face/mob_vr.dmi index c58f1050eb..fb826bda1d 100644 Binary files a/icons/inventory/face/mob_vr.dmi and b/icons/inventory/face/mob_vr.dmi differ diff --git a/icons/inventory/head/item_vr_altevian.dmi b/icons/inventory/head/item_vr_altevian.dmi index acedeb864c..7fabae182d 100644 Binary files a/icons/inventory/head/item_vr_altevian.dmi and b/icons/inventory/head/item_vr_altevian.dmi differ diff --git a/icons/inventory/head/mob_vr_altevian.dmi b/icons/inventory/head/mob_vr_altevian.dmi index cdd6fe581a..deb0367b6c 100644 Binary files a/icons/inventory/head/mob_vr_altevian.dmi and b/icons/inventory/head/mob_vr_altevian.dmi differ diff --git a/icons/inventory/suit/item_vr_altevian.dmi b/icons/inventory/suit/item_vr_altevian.dmi index a3aa3a0e69..f8c7b1e42e 100644 Binary files a/icons/inventory/suit/item_vr_altevian.dmi and b/icons/inventory/suit/item_vr_altevian.dmi differ diff --git a/icons/inventory/suit/mob_vr_altevian.dmi b/icons/inventory/suit/mob_vr_altevian.dmi index 8afd7064fa..54e3236cfd 100644 Binary files a/icons/inventory/suit/mob_vr_altevian.dmi and b/icons/inventory/suit/mob_vr_altevian.dmi differ diff --git a/icons/inventory/uniform/item_vr.dmi b/icons/inventory/uniform/item_vr.dmi index 305bdc3efb..0f56681293 100644 Binary files a/icons/inventory/uniform/item_vr.dmi and b/icons/inventory/uniform/item_vr.dmi differ diff --git a/icons/inventory/uniform/mob_vr.dmi b/icons/inventory/uniform/mob_vr.dmi index f04df19f3e..fb8ffe188e 100644 Binary files a/icons/inventory/uniform/mob_vr.dmi and b/icons/inventory/uniform/mob_vr.dmi differ diff --git a/icons/mob/items/lefthand_guns.dmi b/icons/mob/items/lefthand_guns.dmi index 79f41b6c21..47f4efae72 100644 Binary files a/icons/mob/items/lefthand_guns.dmi and b/icons/mob/items/lefthand_guns.dmi differ diff --git a/icons/mob/items/lefthand_melee_vr.dmi b/icons/mob/items/lefthand_melee_vr.dmi index 43a56cbfb5..ac33a12ad5 100644 Binary files a/icons/mob/items/lefthand_melee_vr.dmi and b/icons/mob/items/lefthand_melee_vr.dmi differ diff --git a/icons/mob/items/righthand_guns.dmi b/icons/mob/items/righthand_guns.dmi index e8dfa949a1..6128d03f5d 100644 Binary files a/icons/mob/items/righthand_guns.dmi and b/icons/mob/items/righthand_guns.dmi differ diff --git a/icons/mob/items/righthand_melee_vr.dmi b/icons/mob/items/righthand_melee_vr.dmi index 89942d6e2f..ea3b23c817 100644 Binary files a/icons/mob/items/righthand_melee_vr.dmi and b/icons/mob/items/righthand_melee_vr.dmi differ diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index c8fd11c08a..11c1e1eac1 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi index 080f2cd557..ca6e269f7f 100644 Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ diff --git a/icons/obj/projectiles_impact.dmi b/icons/obj/projectiles_impact.dmi index 5ff335de3a..66b84f4bed 100644 Binary files a/icons/obj/projectiles_impact.dmi and b/icons/obj/projectiles_impact.dmi differ diff --git a/icons/obj/projectiles_muzzle.dmi b/icons/obj/projectiles_muzzle.dmi index 049d3679c6..71e587f73d 100644 Binary files a/icons/obj/projectiles_muzzle.dmi and b/icons/obj/projectiles_muzzle.dmi differ diff --git a/icons/obj/projectiles_tracer.dmi b/icons/obj/projectiles_tracer.dmi index 8a71334aae..9703c51ab7 100644 Binary files a/icons/obj/projectiles_tracer.dmi and b/icons/obj/projectiles_tracer.dmi differ diff --git a/icons/obj/weapons_vr.dmi b/icons/obj/weapons_vr.dmi index 33d8a9f286..7a1b9844d1 100644 Binary files a/icons/obj/weapons_vr.dmi and b/icons/obj/weapons_vr.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 5520bb526b..0c686b208c 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -3808,6 +3808,7 @@ #include "code\modules\projectiles\guns\projectile_ch.dm" #include "code\modules\projectiles\guns\toy.dm" #include "code\modules\projectiles\guns\vox.dm" +#include "code\modules\projectiles\guns\energy\altevian_vr.dm" #include "code\modules\projectiles\guns\energy\bsharpoon_vr.dm" #include "code\modules\projectiles\guns\energy\crestrose_vr.dm" #include "code\modules\projectiles\guns\energy\dominator_vr.dm" @@ -3855,6 +3856,7 @@ #include "code\modules\projectiles\guns\magnetic\magnetic_railgun.dm" #include "code\modules\projectiles\guns\magnetic\magnetic_railgun_ch.dm" #include "code\modules\projectiles\guns\magnetic\magnetic_railgun_vr.dm" +#include "code\modules\projectiles\guns\projectile\altevian_vr.dm" #include "code\modules\projectiles\guns\projectile\automatic.dm" #include "code\modules\projectiles\guns\projectile\automatic_ch.dm" #include "code\modules\projectiles\guns\projectile\automatic_vr.dm"