diff --git a/code/game/objects/closets/syndicate.dm b/code/game/objects/closets/syndicate.dm index 82d1b114ba9..9b8b6629d33 100644 --- a/code/game/objects/closets/syndicate.dm +++ b/code/game/objects/closets/syndicate.dm @@ -7,7 +7,8 @@ new /obj/item/clothing/head/helmet/space/syndicate(src) new /obj/item/clothing/suit/space/syndicate(src) new /obj/item/weapon/crowbar(src) - new /obj/item/weapon/cell(src) + new /obj/item/weapon/cell/high(src) new /obj/item/weapon/card/id/syndicate(src) new /obj/item/device/multitool(src) + new /obj/item/weapon/shield/riot(src) diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 8012ccad7e2..7772b5b246b 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -70,9 +70,22 @@ multiple_sprites = 1 - /obj/item/ammo_magazine/a12mm/empty name = "magazine (12mm)" icon_state = "12mm" ammo_type = "/obj/item/ammo_casing/12mm" - max_ammo = 0 \ No newline at end of file + max_ammo = 0 + +/obj/item/ammo_magazine/a50 + name = "magazine (.50)" + icon_state = "50ae" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/a50" + max_ammo = 7 + multiple_sprites = 1 + +/obj/item/ammo_magazine/a50/empty + name = "magazine (.50)" + icon_state = "50ae" + ammo_type = "/obj/item/ammo_casing/a50" + max_ammo = 0 diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 5febb27e4fc..c9b4cbce067 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -3,6 +3,10 @@ caliber = "357" projectile_type = "/obj/item/projectile/bullet" +/obj/item/ammo_casing/a50 + desc = "A .50AE bullet casing." + caliber = ".50" + projectile_type = "/obj/item/projectile/bullet" /obj/item/ammo_casing/a418 desc = "A .418 bullet casing." diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 060c17718b4..c10c0e65312 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -67,5 +67,3 @@ - - diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index f02112fecfe..8533ef3b33f 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -13,16 +13,35 @@ /obj/item/weapon/gun/projectile/deagle name = "\improper Desert Eagle" - desc = "A robust handgun that uses 357 magnum ammo" + desc = "A robust handgun that uses .50 AE ammo" icon_state = "deagle" force = 14.0 - max_shells = 9 + max_shells = 7 + caliber = ".50" + ammo_type ="/obj/item/ammo_casing/a50" + load_method = 2 + New() + ..() + empty_mag = new /obj/item/ammo_magazine/a50/empty(src) + update_icon() + return + afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag) + ..() + if(!loaded.len && empty_mag) + empty_mag.loc = get_turf(src.loc) + empty_mag = null + playsound(user, 'smg_empty_alarm.ogg', 40, 1) + update_icon() + return + update_icon() + ..() + return /obj/item/weapon/gun/projectile/deagle/gold name = "\improper Desert Eagle" - desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses 357 ammo." + desc = "A gold plated gun folded over a million times by superior martian gunsmiths. Uses .50 AE ammo." icon_state = "deagleg" item_state = "deagleg" @@ -30,7 +49,7 @@ /obj/item/weapon/gun/projectile/deagle/camo name = "\improper Desert Eagle" - desc = "A Deagle brand Deagle for operators operating operationally. Uses 357 ammo." + desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo." icon_state = "deaglecamo" item_state = "deagleg"