diff --git a/code/__DEFINES/projectiles.dm b/code/__DEFINES/projectiles.dm index a34341f228f20..11cfd0b3d1d40 100644 --- a/code/__DEFINES/projectiles.dm +++ b/code/__DEFINES/projectiles.dm @@ -58,10 +58,6 @@ #define CALIBER_HARPOON "harpoon" /// The caliber used by the rebar crossbow. #define CALIBER_REBAR "sharpened rod" -/// The caliber used by the rebar crossbow when forced to hold 2 rods. -#define CALIBER_REBAR_FORCED "sharpened rod" -/// The caliber used by the syndicate rebar crossbow. -#define CALIBER_REBAR_SYNDIE "sharpened rod" /// The caliber used by the meat hook. #define CALIBER_HOOK "hook" /// The caliber used by the changeling tentacle mutation. diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index d9e1bf201155f..c99429cce509c 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -411,7 +411,9 @@ new weapon_to_spawn (src) for(var/i in 1 to 2) new extra_to_spawn (src) - new ammo_box_to_spawn(src) + + if(ammo_box_to_spawn) + new ammo_box_to_spawn(src) /obj/item/storage/toolbox/guncase/traitor/update_icon_state() . = ..() @@ -459,6 +461,16 @@ extra_to_spawn = /obj/item/ammo_box/magazine/whispering_jester_45_magazine ammo_box_to_spawn = /obj/item/ammo_box/c45/caseless +/obj/item/storage/toolbox/guncase/traitor/revolver + name = "\improper Syndicate revolver gun case" + weapon_to_spawn = /obj/item/gun/ballistic/revolver/syndicate + extra_to_spawn = /obj/item/ammo_box/a357 + +/obj/item/storage/toolbox/guncase/traitor/revolver/PopulateContents() + new weapon_to_spawn(src) + for(var/i in 1 to 3) + new extra_to_spawn(src) + /obj/item/storage/toolbox/guncase/traitor/wespe name = "\improper Wespe pistol gun case" weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/sol/evil/unrestricted diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm index df9ab738b262e..700cb7b9a256a 100644 --- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm @@ -33,7 +33,7 @@ caliber = CALIBER_HARPOON ammo_type = /obj/item/ammo_casing/harpoon -/obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/normal +/obj/item/ammo_box/magazine/internal/boltaction/rebarxbow name = "single round magazine" max_ammo = 1 caliber = CALIBER_REBAR @@ -42,13 +42,12 @@ /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/force name = "two round magazine" max_ammo = 2 - caliber = CALIBER_REBAR_FORCED + caliber = CALIBER_REBAR ammo_type = /obj/item/ammo_casing/rebar /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie - max_ammo = 3 - caliber = CALIBER_REBAR_SYNDIE - ammo_type = /obj/item/ammo_casing/rebar + caliber = CALIBER_REBAR + ammo_type = /obj/item/ammo_casing/rebar/syndie /obj/item/ammo_box/magazine/internal/boltaction/minerjdj name = "GIGANTIC RIFLE BREECH THAT SHOULD NOT EXIST" diff --git a/code/modules/projectiles/guns/ballistic/crossbow.dm b/code/modules/projectiles/guns/ballistic/crossbow.dm index ddbfb9b6543dc..3f48b42e7ca9c 100644 --- a/code/modules/projectiles/guns/ballistic/crossbow.dm +++ b/code/modules/projectiles/guns/ballistic/crossbow.dm @@ -22,7 +22,7 @@ cartridge_wording = "rod" weapon_weight = WEAPON_HEAVY initial_caliber = CALIBER_REBAR - accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/normal + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow recoil = 0 fire_sound = 'sound/items/xbow_lock.ogg' can_be_sawn_off = FALSE @@ -87,13 +87,12 @@ /obj/item/gun/ballistic/rifle/rebarxbow/syndie name = "syndicate rebar crossbow" desc = "The syndicate liked the bootleg rebar crossbow NT engineers made, so they showed what it could be if properly developed. \ - Holds three shots without a chance of exploding, and features a built in scope. Compatible with all known crossbow ammunition." + features a built in scope. Compatible with all known crossbow ammunition." base_icon_state = "rebarxbowsyndie" icon_state = "rebarxbowsyndie" inhand_icon_state = "rebarxbowsyndie" worn_icon_state = "rebarxbowsyndie" w_class = WEIGHT_CLASS_NORMAL - initial_caliber = CALIBER_REBAR draw_time = 1 accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/rebarxbow/syndie diff --git a/code/modules/projectiles/projectile/bullets/crossbow.dm b/code/modules/projectiles/projectile/bullets/crossbow.dm index c063797f9476f..b220748976679 100644 --- a/code/modules/projectiles/projectile/bullets/crossbow.dm +++ b/code/modules/projectiles/projectile/bullets/crossbow.dm @@ -32,7 +32,7 @@ icon_state = "rebar" damage = 60 dismemberment = 2 //It's a budget sniper rifle. - armour_penetration = 30 //A bit better versus armor. + armour_penetration = 60 //A bit better versus armor. wound_bonus = 10 bare_wound_bonus = 20 embed_falloff_tile = -3 diff --git a/code/modules/uplink/uplink_items/ammunition.dm b/code/modules/uplink/uplink_items/ammunition.dm index 900dc3412eb45..2f8e9ab844836 100644 --- a/code/modules/uplink/uplink_items/ammunition.dm +++ b/code/modules/uplink/uplink_items/ammunition.dm @@ -17,7 +17,7 @@ /datum/uplink_item/ammo/pistol name = "9mm Magazine Case" - desc = "A case containing three additional 8-round 9mm magazines, compatible with the Makarov pistol, as well as \ + desc = "A case containing three additional 12-round 9mm magazines, compatible with the Makarov pistol, as well as \ a box of loose 9mm ammunition." item = /obj/item/storage/toolbox/guncase/traitor/ammunition cost = 2 @@ -26,7 +26,7 @@ /datum/uplink_item/ammo/pistolap name = "9mm Armour Piercing Magazine" - desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \ + desc = "An additional 12-round 9mm magazine, compatible with the Makarov pistol. \ These rounds are less effective at injuring the target but penetrate protective gear." progression_minimum = 30 MINUTES item = /obj/item/ammo_box/magazine/m9mm/ap @@ -35,7 +35,7 @@ /datum/uplink_item/ammo/pistolhp name = "9mm Hollow Point Magazine" - desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \ + desc = "An additional 12-round 9mm magazine, compatible with the Makarov pistol. \ These rounds are more damaging but ineffective against armour." progression_minimum = 30 MINUTES item = /obj/item/ammo_box/magazine/m9mm/hp @@ -44,7 +44,7 @@ /datum/uplink_item/ammo/pistolfire name = "9mm Incendiary Magazine" - desc = "An additional 8-round 9mm magazine, compatible with the Makarov pistol. \ + desc = "An additional 12-round 9mm magazine, compatible with the Makarov pistol. \ Loaded with incendiary rounds which inflict little damage, but ignite the target." progression_minimum = 30 MINUTES item = /obj/item/ammo_box/magazine/m9mm/fire diff --git a/code/modules/uplink/uplink_items/firearms.dm b/code/modules/uplink/uplink_items/firearms.dm index 5b29cd5d568c4..69530152b1119 100644 --- a/code/modules/uplink/uplink_items/firearms.dm +++ b/code/modules/uplink/uplink_items/firearms.dm @@ -49,17 +49,17 @@ /datum/uplink_item/firearms/revolver name = "Syndicate Revolver" desc = "Waffle Co.'s modernized Syndicate revolver. Fires 7 brutal rounds of .357 Magnum." - item = /obj/item/gun/ballistic/revolver/syndicate + item = /obj/item/storage/toolbox/guncase/traitor/revolver progression_minimum = 30 MINUTES - cost = 10 + cost = 12 surplus = 50 purchasable_from = ~UPLINK_CLOWN_OPS /datum/uplink_item/firearms/rebarxbowsyndie name = "Syndicate Rebar Crossbow" - desc = "A much more proffessional version of the engineer's bootleg rebar crossbow. 3 shot mag, quicker loading, and better ammo. Owners manual included." + desc = "A much more proffessional version of the engineer's bootleg rebar crossbow. Quicker loading, and better ammo. Owners manual included." item = /obj/item/storage/box/syndie_kit/rebarxbowsyndie - cost = 10 + cost = 8 /datum/uplink_item/firearms/laser_musket name = "Syndicate Laser Musket" @@ -99,12 +99,6 @@ item = /obj/item/storage/box/syndie_kit/shit_smg_bundle cost = 4 -/datum/uplink_item/firearms/renoster - name = "Renoster Shotgun Case" - desc = "A twelve gauge shotgun with an eight shell capacity underneath. Comes with two boxes of buckshot." - item = /obj/item/storage/toolbox/guncase/nova/opfor/renoster - cost = 10 - /datum/uplink_item/firearms/slipstick name = "Syndie Lipstick" desc = "Stylish way to kiss to death, isn't it syndiekisser?"