diff --git a/modular_skyrat/modules/moretraitoritems/code/syndicate.dm b/modular_skyrat/modules/moretraitoritems/code/syndicate.dm index 7f352bb5603..06743c4d90d 100644 --- a/modular_skyrat/modules/moretraitoritems/code/syndicate.dm +++ b/modular_skyrat/modules/moretraitoritems/code/syndicate.dm @@ -17,9 +17,13 @@ desc = "A sleek, sturdy box used to hold all parts to build a weapons recharger." icon_state = "syndiebox" -/obj/item/storage/box/syndie_kit/charger/PopulateContents() +/obj/item/storage/box/syndie_kit/recharger/PopulateContents() new /obj/item/circuitboard/machine/recharger(src) new /obj/item/stock_parts/capacitor/quadratic(src) + new /obj/item/stack/sheet/iron/five(src) + new /obj/item/stack/cable_coil/five(src) + new /obj/item/screwdriver/nuke(src) + new /obj/item/wrench(src) //Back-up space suit /obj/item/storage/box/syndie_kit/space_suit diff --git a/modular_skyrat/modules/opposing_force/code/equipment/guns.dm b/modular_skyrat/modules/opposing_force/code/equipment/guns.dm index 98f0c8d29a0..0f081aba133 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/guns.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/guns.dm @@ -61,6 +61,26 @@ new /obj/item/ammo_box/magazine/m7mm(src) new /obj/item/ammo_box/magazine/m7mm(src) +/datum/opposing_force_equipment/ranged/hook_shotgun + name = "Hook Modified Sawn-off Shotgun" + description = "Range isn't an issue when you can bring your victim to you." + item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/hook_shotgun + +/obj/item/storage/toolbox/guncase/skyrat/opfor/hook_shotgun/PopulateContents() + new /obj/item/gun/ballistic/shotgun/hook(src) + new /obj/item/ammo_box/advanced/s12gauge/buckshot(src) + new /obj/item/ammo_box/advanced/s12gauge/buckshot(src) + +/datum/opposing_force_equipment/ranged/rebar_crossbow + name = "Syndicate Rebar Crossbow" + description = "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. Normally uses special syndicate jagged iron bars, but can be wrenched to shoot inferior normal ones." + item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/rebar_crossbow + +/obj/item/storage/toolbox/guncase/skyrat/opfor/rebar_crossbow/PopulateContents() + new /obj/item/gun/ballistic/rifle/rebarxbow/syndie(src) + new /obj/item/book/granter/crafting_recipe/dusting/rebarxbowsyndie_ammo(src) + //laser /datum/opposing_force_equipment/ranged/ion name = "ion carbine" @@ -217,8 +237,8 @@ /obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/foamforce_smg_basic/PopulateContents() new /obj/item/gun/ballistic/automatic/toy/unrestricted(src) - new /obj/item/ammo_box/magazine/toy/smg(src) - new /obj/item/ammo_box/magazine/toy/smg(src) + new /obj/item/ammo_box/magazine/toy/smg/riot(src) + new /obj/item/ammo_box/magazine/toy/smg/riot(src) //laser /datum/opposing_force_equipment/ranged_stealth/egun_mini diff --git a/modular_skyrat/modules/opposing_force/code/equipment/melee.dm b/modular_skyrat/modules/opposing_force/code/equipment/melee.dm index ba7657911f0..24a25b3be13 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/melee.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/melee.dm @@ -49,9 +49,6 @@ Using a wrench on the piston valve will allow you to tweak the amount of gas used per punch to \ deal extra damage and hit targets further. Use a screwdriver to take out any attached tanks." -/datum/opposing_force_equipment/melee/cultblade - item_type = /obj/item/melee/cultblade - /datum/opposing_force_equipment/melee/meathook name = "Butcher's Meat Hook" item_type = /obj/item/gun/magic/hook @@ -92,12 +89,6 @@ /datum/opposing_force_equipment/melee_stealth/telescopicshield item_type = /obj/item/shield/riot/tele -/datum/opposing_force_equipment/melee_stealth/cultdagger - item_type = /obj/item/melee/cultblade/dagger - -/datum/opposing_force_equipment/melee_stealth/sicklyblade - item_type = /obj/item/melee/sickly_blade - /datum/opposing_force_equipment/melee_stealth/northstar item_type = /obj/item/clothing/gloves/rapid description = "By putting on these gloves, you will find you can punch things at vastly increased speed."