diff --git a/code/modules/projectiles/guns/energy/nuclear_vr.dm b/code/modules/projectiles/guns/energy/nuclear_vr.dm index 313fcd37d5..64ef3ace41 100644 --- a/code/modules/projectiles/guns/energy/nuclear_vr.dm +++ b/code/modules/projectiles/guns/energy/nuclear_vr.dm @@ -11,4 +11,8 @@ icon = 'icons/obj/gun.dmi' //Points it back at the default file so eguns_vr.dmi doesn't need to mirror all the sprites /obj/item/weapon/gun/energy/gun/nuclear - icon = 'icons/obj/gun.dmi' //Points it back at the default file so eguns_vr.dmi doesn't need to mirror all the sprites \ No newline at end of file + icon = 'icons/obj/gun.dmi' //Points it back at the default file so eguns_vr.dmi doesn't need to mirror all the sprites + firemodes = list( + list(mode_name="stun", projectile_type=/obj/item/projectile/beam/stun, modifystate="nucgunstun", charge_cost = 240), + list(mode_name="lethal", projectile_type=/obj/item/projectile/beam, modifystate="nucgunkill", charge_cost = 240), + ) \ No newline at end of file diff --git a/code/modules/projectiles/projectile/energy.dm b/code/modules/projectiles/projectile/energy.dm index 3448c2a9e9..078855c15b 100644 --- a/code/modules/projectiles/projectile/energy.dm +++ b/code/modules/projectiles/projectile/energy.dm @@ -215,19 +215,21 @@ name = "phase wave" icon_state = "phase" kill_count = 6 - damage = 5 - SA_bonus_damage = 45 // 50 total on animals - SA_vulnerability = SA_ANIMAL + damage = 50 //VOREStation Edit + //SA_bonus_damage = 45 // 50 total on animals //VOREStation Edit - No bonus damage + //SA_vulnerability = SA_ANIMAL //VOREStation Edit /obj/item/projectile/energy/phase/light kill_count = 4 - SA_bonus_damage = 35 // 40 total on animals + damage = 40 //VOREStation Edit + //SA_bonus_damage = 35 // 40 total on animals //VOREStation Edit /obj/item/projectile/energy/phase/heavy kill_count = 8 - SA_bonus_damage = 55 // 60 total on animals + damage = 60 //VOREStation Edit + //SA_bonus_damage = 55 // 60 total on animals //VOREStation Edit /obj/item/projectile/energy/phase/heavy/cannon kill_count = 10 - damage = 15 - SA_bonus_damage = 60 // 75 total on animals \ No newline at end of file + damage = 75 //VOREStation Edit + //SA_bonus_damage = 60 // 75 total on animals //VOREStation Edit \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index d897855aa0..ade71db51f 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -733,9 +733,9 @@ icon_state = "phaser" item_state = "phaser" item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns_vr.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns_vr.dmi', "slot_belt" = 'icons/mob/belt_vr.dmi') - item_state_slots = list(slot_r_hand_str = "phaser", slot_l_hand_str = "phaser", "slot_belt" = "phaser") fire_sound = 'sound/weapons/laser2.ogg' origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 2, TECH_POWER = 4) + charge_cost = 240 battery_lock = 1 unacidable = 1 @@ -744,7 +744,7 @@ projectile_type = /obj/item/projectile/beam firemodes = list( - list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 300), + list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 240), list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 60), ) @@ -808,32 +808,41 @@ return 0 return ..() +//Phaser Carbine - Reskinned phaser +/obj/item/weapon/gun/energy/frontier/locked/carbine + name = "frontier carbine" + desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." + icon = 'icons/obj/gun_vr.dmi' + icon_state = "carbinekill" + item_state = "retro" + item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi') + + modifystate = "carbinekill" + firemodes = list( + list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="carbinekill", charge_cost = 240), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, modifystate="carbinestun", charge_cost = 60), + ) + +/obj/item/weapon/gun/energy/frontier/locked/carbine/update_icon() + if(recharging) + icon_state = "[modifystate]_pump" + update_held_icon() + return + ..() + //Expeditionary Holdout Phaser /obj/item/weapon/gun/energy/frontier/locked/holdout name = "holdout frontier phaser" desc = "A recently introduced weapon intended for self defense by expeditionary support. It includes the same crank charger as the frontier phaser." icon = 'icons/obj/gun_vr.dmi' - icon_state = "PDW" - item_state = "gun" + icon_state = "holdoutkill" + item_state = null + w_class = ITEMSIZE_SMALL - charge_cost = 600 + charge_cost = 480 + modifystate = "holdoutkill" firemodes = list( - list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, charge_cost = 600), - list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, charge_cost = 120), + list(mode_name="normal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="holdoutkill", charge_cost = 480), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser, modifystate="holdoutshock", charge_cost = 120), + list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutstun", charge_cost = 480), ) - -/obj/item/weapon/gun/energy/frontier/locked/holdout/proc/update_mode() - var/datum/firemode/current_mode = firemodes[sel_mode] - switch(current_mode.name) - if("low-power") add_overlay("taser_pdw") - if("normal") add_overlay("lazer_pdw") - -/obj/item/weapon/gun/energy/frontier/locked/holdout/update_icon() - cut_overlays() - if(recharging) - icon_state = "[initial(icon_state)]_pump" - update_held_icon() - return - else - icon_state = "[initial(icon_state)]" - update_mode() diff --git a/icons/mob/items/lefthand_guns_vr.dmi b/icons/mob/items/lefthand_guns_vr.dmi index 8f6b3b50ce..c64d1453e4 100644 Binary files a/icons/mob/items/lefthand_guns_vr.dmi and b/icons/mob/items/lefthand_guns_vr.dmi differ diff --git a/icons/mob/items/righthand_guns_vr.dmi b/icons/mob/items/righthand_guns_vr.dmi index 6048f79855..193d6ee292 100644 Binary files a/icons/mob/items/righthand_guns_vr.dmi and b/icons/mob/items/righthand_guns_vr.dmi differ diff --git a/icons/obj/gun_vr.dmi b/icons/obj/gun_vr.dmi index afa2edaedc..bb393fc1f7 100644 Binary files a/icons/obj/gun_vr.dmi and b/icons/obj/gun_vr.dmi differ diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index 27b0150331..48b2f88d5b 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -26,6 +26,7 @@ /obj/item/stack/marker_beacon/thirty, /obj/item/weapon/material/knife/tacknife/survival, /obj/item/weapon/material/knife/machete/deluxe, + /obj/item/weapon/gun/energy/frontier/locked/carbine, /obj/item/clothing/accessory/holster/machete, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2)