diff --git a/code/datums/autolathe/arms_vr.dm b/code/datums/autolathe/arms_vr.dm index e517c557e01..72f0b9d15ab 100644 --- a/code/datums/autolathe/arms_vr.dm +++ b/code/datums/autolathe/arms_vr.dm @@ -1,26 +1,26 @@ /datum/category_item/autolathe/arms/speedloader_357_flash name = "speedloader (.357 flash)" - path =/obj/item/ammo_magazine/m357/flash + path =/obj/item/ammo_magazine/s357/flash hidden = 1 /datum/category_item/autolathe/arms/speedloader_357_stun name = "speedloader (.357 stun)" - path =/obj/item/ammo_magazine/m357/stun + path =/obj/item/ammo_magazine/s357/stun hidden = 1 /datum/category_item/autolathe/arms/speedloader_357_rubber name = "speedloader (.357 rubber)" - path =/obj/item/ammo_magazine/m357/rubber + path =/obj/item/ammo_magazine/s357/rubber hidden = 1 /datum/category_item/autolathe/arms/speedloader_44 name = "speedloader (.44)" - path =/obj/item/ammo_magazine/m44sl + path =/obj/item/ammo_magazine/s44 hidden = 1 /datum/category_item/autolathe/arms/speedloader_44_rubber name = "speedloader (.44 rubber)" - path =/obj/item/ammo_magazine/m44sl/rubber + path =/obj/item/ammo_magazine/s44/rubber hidden = 1 /datum/category_item/autolathe/arms/mag_44 diff --git a/code/game/objects/random/random_vr.dm b/code/game/objects/random/random_vr.dm index dd873ddd246..dac04e6c335 100644 --- a/code/game/objects/random/random_vr.dm +++ b/code/game/objects/random/random_vr.dm @@ -88,7 +88,7 @@ item_to_spawn() return pick(prob(5);/obj/item/weapon/storage/box/shotgunammo,\ prob(5);/obj/item/weapon/storage/box/shotgunshells,\ - prob(5);/obj/item/ammo_magazine/m357,\ + prob(5);/obj/item/ammo_magazine/s357,\ prob(5);/obj/item/ammo_magazine/clip/c762,\ prob(5);/obj/item/ammo_magazine/m45,\ prob(5);/obj/item/ammo_magazine/m45/rubber,\ 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 8a9875506e8..c3ae215da8e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -295,10 +295,7 @@ new /obj/item/device/radio/headset/headset_sec(src) new /obj/item/device/radio/headset/headset_sec/alt(src) new /obj/item/clothing/suit/storage/vest/detective(src) - new /obj/item/ammo_magazine/m44sl/rubber(src) - new /obj/item/ammo_magazine/m44sl/rubber(src) new /obj/item/taperoll/police(src) - new /obj/item/weapon/gun/projectile/revolver/consul(src) //VOREStation Edit new /obj/item/clothing/accessory/holster/armpit(src) new /obj/item/device/flashlight/maglight(src) new /obj/item/weapon/reagent_containers/food/drinks/flask/detflask(src) diff --git a/code/modules/awaymissions/loot_vr.dm b/code/modules/awaymissions/loot_vr.dm index b6be0c0b5d6..6a4f715128d 100644 --- a/code/modules/awaymissions/loot_vr.dm +++ b/code/modules/awaymissions/loot_vr.dm @@ -185,7 +185,7 @@ var/new_ammo = pick( // Copied from Random.dm prob(5);/obj/item/weapon/storage/box/shotgunammo,\ prob(5);/obj/item/weapon/storage/box/shotgunshells,\ - prob(5);/obj/item/ammo_magazine/m357,\ + prob(5);/obj/item/ammo_magazine/s357,\ prob(5);/obj/item/ammo_magazine/clip/c762,\ prob(5);/obj/item/ammo_magazine/m45,\ prob(5);/obj/item/ammo_magazine/m45/rubber,\ diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index 7b0c810ce61..76decc01cd0 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -554,7 +554,7 @@ //Detective gun /obj/item/weapon/gun/projectile/revolver/consul name = "FS REV .44 \"Consul\"" - desc = "A choice revolver for when you absolutely, positively need to put a hole in the other guy. Uses .44 ammo." + desc = "Are you feeling lucky, punk? Uses .44 ammo." icon = 'icons/obj/gun_vr.dmi' icon_state = "inspector" @@ -742,50 +742,50 @@ ammo_type = /obj/item/ammo_casing/a9mmp //.357 special ammo -/obj/item/ammo_magazine/m357/stun +/obj/item/ammo_magazine/s357/stun name = "speedloader (.357 stun)" desc = "A speedloader for .357 revolvers." icon = 'icons/obj/ammo_vr.dmi' icon_state = "s357" - caliber = "357" + caliber = ".357" ammo_type = /obj/item/ammo_casing/a357/stun /obj/item/ammo_casing/a357/stun desc = "A .357 stun bullet casing." - caliber = "357" + caliber = ".357" icon = 'icons/obj/ammo_vr.dmi' icon_state = "stun357" projectile_type = /obj/item/projectile/energy/electrode/stunshot/strong -/obj/item/ammo_magazine/m357/rubber +/obj/item/ammo_magazine/s357/rubber name = "speedloader (.357 rubber)" desc = "A speedloader for .357 revolvers." icon = 'icons/obj/ammo_vr.dmi' icon_state = "r357" - caliber = "357" + caliber = ".357" ammo_type = /obj/item/ammo_casing/a357/rubber /obj/item/ammo_casing/a357/rubber desc = "A .357 rubber bullet casing." - caliber = "357" + caliber = ".357" icon = 'icons/obj/ammo_vr.dmi' icon_state = "rubber357" projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong -/obj/item/ammo_magazine/m357/flash +/obj/item/ammo_magazine/s357/flash name = "speedloader (.357 flash)" desc = "A speedloader for .357 revolvers." icon = 'icons/obj/ammo_vr.dmi' icon_state = "f357" - caliber = "357" + caliber = ".357" ammo_type = /obj/item/ammo_casing/a357/flash /obj/item/ammo_casing/a357/flash desc = "A .357 flash bullet casing." - caliber = "357" + caliber = ".357" icon = 'icons/obj/ammo_vr.dmi' icon_state = "flash357" projectile_type = /obj/item/projectile/energy/flash/strong @@ -804,36 +804,17 @@ mag_type = MAGAZINE //.44 -/obj/item/ammo_casing/a44 - icon = 'icons/obj/ammo_vr.dmi' - icon_state = "a357" - desc = "A .44 bullet casing." - caliber = ".44" - projectile_type = /obj/item/projectile/bullet/pistol/strong - /obj/item/ammo_casing/a44/rubber - icon = 'icons/obj/ammo_vr.dmi' - icon_state = "rubber357" + icon_state = "r-casing" desc = "A .44 rubber bullet casing." projectile_type = /obj/item/projectile/bullet/pistol/rubber/strong -/obj/item/ammo_magazine/m44 - desc = "A magazine for .44 ammo." - icon = 'icons/obj/ammo_vr.dmi' - icon_state = "44lethal" - caliber = ".44" - matter = list(DEFAULT_WALL_MATERIAL = 1680) - ammo_type = /obj/item/ammo_casing/a44 - max_ammo = 8 - mag_type = MAGAZINE - /obj/item/ammo_magazine/m44/rubber desc = "A magazine for .44 less-than-lethal ammo." - icon_state = "44rubber" ammo_type = /obj/item/ammo_casing/a44/rubber //.44 speedloaders -/obj/item/ammo_magazine/m44sl +/obj/item/ammo_magazine/s44 name = "speedloader (.44)" desc = "A speedloader for .44 revolvers." icon = 'icons/obj/ammo_vr.dmi' @@ -845,7 +826,7 @@ multiple_sprites = 1 mag_type = SPEEDLOADER -/obj/item/ammo_magazine/m44sl/rubber +/obj/item/ammo_magazine/s44/rubber name = "speedloader (.44 rubber)" icon_state = "r357" ammo_type = /obj/item/ammo_casing/a44/rubber diff --git a/icons/obj/ammo_vr.dmi b/icons/obj/ammo_vr.dmi index fe871d3e66b..20dff527a9d 100644 Binary files a/icons/obj/ammo_vr.dmi and b/icons/obj/ammo_vr.dmi differ diff --git a/icons/obj/gun_vr.dmi b/icons/obj/gun_vr.dmi index 9ad5e01a80b..70b524ce8c1 100644 Binary files a/icons/obj/gun_vr.dmi and b/icons/obj/gun_vr.dmi differ