diff --git a/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm b/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm new file mode 100644 index 0000000000..012d73d435 --- /dev/null +++ b/code/modules/clothing/spacesuits/rig/suits/alien_vr.dm @@ -0,0 +1,5 @@ +/obj/item/weapon/rig/breacher + armor = list(melee = 60, bullet = 45, laser = 45, energy = 10, bomb = 50, bio = 100, rad = 20) + +/obj/item/weapon/rig/breacher/fancy + armor = list(melee = 85, bullet = 80, laser = 80, energy = 40, bomb = 80, bio = 100, rad = 60) //Still a tank just not indestructable diff --git a/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm b/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm new file mode 100644 index 0000000000..b9b8d8906e --- /dev/null +++ b/code/modules/clothing/spacesuits/rig/suits/combat_vr.dm @@ -0,0 +1,5 @@ +/obj/item/weapon/rig/combat + armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) + +/obj/item/weapon/rig/military + armor = list(melee = 80, bullet = 75, laser = 65, energy = 15, bomb = 80, bio = 100, rad = 40) diff --git a/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm b/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm index 14b1e1d98f..4782058b3a 100644 --- a/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm +++ b/code/modules/clothing/spacesuits/rig/suits/ert_vr.dm @@ -10,4 +10,4 @@ ) /obj/item/weapon/rig/ert/assetprotection - armor = list(melee = 80, bullet = 65, laser = 50, energy = 15, bomb = 80, bio = 100, rad = 60) + armor = list(melee = 80, bullet = 70, laser = 60, energy = 15, bomb = 80, bio = 100, rad = 60) diff --git a/code/modules/clothing/spacesuits/void/ert_vr.dm b/code/modules/clothing/spacesuits/void/ert_vr.dm index 2f10083694..7f253ddfe8 100644 --- a/code/modules/clothing/spacesuits/void/ert_vr.dm +++ b/code/modules/clothing/spacesuits/void/ert_vr.dm @@ -3,7 +3,7 @@ desc = "Utilizing cutting edge tech from Hephaestus, the Mark VII is the latest and greatest in semi-powered personal protection systems; like the civilian AutoLok suit, the Mark VII can automatically adapt to fit most species without issue via RFID tags. This significantly reduces the time required for response teams to suit up, as it eliminates the need for dedicated cycler units. It also has an integrated, unremovable helmet. Standard air tanks, suit coolers, and magboots may be installed and removed as needed." icon_state = "ertsuit" item_state = "ertsuit" - armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 100, rad = 100) + armor = list(melee = 65, bullet = 55, laser = 55,energy = 15, bomb = 50, bio = 100, rad = 100) slowdown = 0.5 siemens_coefficient = 0.5 species_restricted = list("exclude",SPECIES_DIONA,SPECIES_VOX,SPECIES_TESHARI,SPECIES_ALTEVIAN) //this thing can autoadapt @@ -15,6 +15,7 @@ min_pressure_protection = 0 * ONE_ATMOSPHERE max_pressure_protection = 15* ONE_ATMOSPHERE max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE+10000 + allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword,/obj/item/weapon/handcuffs) /obj/item/clothing/suit/space/void/responseteam/command name = "Mark VII-C Emergency Response Team Commander Suit" diff --git a/code/modules/clothing/spacesuits/void/event_vr.dm b/code/modules/clothing/spacesuits/void/event_vr.dm index e62e53e7f3..ca48bfcfe1 100644 --- a/code/modules/clothing/spacesuits/void/event_vr.dm +++ b/code/modules/clothing/spacesuits/void/event_vr.dm @@ -240,7 +240,7 @@ 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) + armor = list(melee = 70, bullet = 70, laser = 70, energy = 30, bomb = 80, bio = 100, rad = 40) species_restricted = list(SPECIES_ALTEVIAN) no_cycle = TRUE @@ -254,7 +254,7 @@ 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) + armor = list(melee = 70, bullet = 70, laser = 70, energy = 30, bomb = 80, bio = 100, rad = 40) species_restricted = list(SPECIES_ALTEVIAN) no_cycle = TRUE diff --git a/code/modules/clothing/spacesuits/void/merc_vr.dm b/code/modules/clothing/spacesuits/void/merc_vr.dm new file mode 100644 index 0000000000..d72bc6e7cc --- /dev/null +++ b/code/modules/clothing/spacesuits/void/merc_vr.dm @@ -0,0 +1,11 @@ +/obj/item/clothing/head/helmet/space/void/merc + armor = list(melee = 70, bullet = 60, laser = 40,energy = 15, bomb = 45, bio = 100, rad = 60) + +/obj/item/clothing/suit/space/void/merc + armor = list(melee = 70, bullet = 60, laser = 40,energy = 15, bomb = 45, bio = 100, rad = 60) + +/obj/item/clothing/head/helmet/space/void/merc/fire + armor = list(melee = 50, bullet = 40, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50) + +/obj/item/clothing/suit/space/void/merc/fire + armor = list(melee = 50, bullet = 40, laser = 70, energy = 20, bomb = 60, bio = 100, rad = 50) \ No newline at end of file diff --git a/code/modules/projectiles/guns/energy/pump.dm b/code/modules/projectiles/guns/energy/pump.dm index 693ad2bb01..5b9631be48 100644 --- a/code/modules/projectiles/guns/energy/pump.dm +++ b/code/modules/projectiles/guns/energy/pump.dm @@ -183,6 +183,9 @@ scoped_accuracy = 40 one_handed_penalty = 50 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand. phase_power = 150 //efficient crank charger + fire_sound = null + charge_cost = 600 + fire_delay = 35 projectile_type = /obj/item/projectile/beam/sniper modifystate = "phrifledmr" diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 3e4b9152ad..a807f04c9a 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ diff --git a/maps/offmap_vr/om_ships/shelter_6.dmm b/maps/offmap_vr/om_ships/shelter_6.dmm index cf5c20d94b..97da4ca589 100644 --- a/maps/offmap_vr/om_ships/shelter_6.dmm +++ b/maps/offmap_vr/om_ships/shelter_6.dmm @@ -284,6 +284,7 @@ /obj/item/ammo_magazine/m545, /obj/item/weapon/gun/projectile/shotgun/pump/combat, /obj/item/weapon/gun/projectile/shotgun/pump/combat, +<<<<<<< HEAD /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunshells/large, /obj/item/weapon/storage/box/shotgunshells/large, @@ -300,6 +301,26 @@ /obj/item/weapon/storage/box/stunshells, /obj/item/weapon/storage/box/flashshells, /obj/item/weapon/storage/box/flashshells, +======= +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g/pellet, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g, +/obj/item/ammo_magazine/ammo_box/b12g/emp, +/obj/item/ammo_magazine/ammo_box/b12g/emp, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/beanbag, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, +/obj/item/ammo_magazine/ammo_box/b12g/stunshell, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/flash, +/obj/item/ammo_magazine/ammo_box/b12g/flechette, +/obj/item/ammo_magazine/ammo_box/b12g/flechette, +>>>>>>> bfc1eb2a8c... Merge pull request #14354 from Novacat/nova-basicfixes /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, /obj/item/weapon/gun/energy/locked/frontier/carbine/unlocked, diff --git a/vorestation.dme b/vorestation.dme index b483567d86..43a8fca453 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2176,7 +2176,9 @@ #include "code\modules\clothing\spacesuits\rig\modules\specific\vision.dm" #include "code\modules\clothing\spacesuits\rig\modules\specific\voice.dm" #include "code\modules\clothing\spacesuits\rig\suits\alien.dm" +#include "code\modules\clothing\spacesuits\rig\suits\alien_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\combat.dm" +#include "code\modules\clothing\spacesuits\rig\suits\combat_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert.dm" #include "code\modules\clothing\spacesuits\rig\suits\ert_vr.dm" #include "code\modules\clothing\spacesuits\rig\suits\light.dm" @@ -2190,6 +2192,7 @@ #include "code\modules\clothing\spacesuits\void\event.dm" #include "code\modules\clothing\spacesuits\void\event_vr.dm" #include "code\modules\clothing\spacesuits\void\merc.dm" +#include "code\modules\clothing\spacesuits\void\merc_vr.dm" #include "code\modules\clothing\spacesuits\void\military_vr.dm" #include "code\modules\clothing\spacesuits\void\station.dm" #include "code\modules\clothing\spacesuits\void\station_vr.dm"