diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 5963b07faf1..980cca93832 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -120,6 +120,10 @@ var/list/uplink_items = list() gamemodes = list(/datum/game_mode/nuclear) surplus = 40 +/datum/uplink_item/dangerous/smg/unrestricted + item = /obj/item/weapon/gun/projectile/automatic/c20r/unrestricted + gamemodes = list(/datum/game_mode/gang) + /datum/uplink_item/dangerous/carbine name = "M-90gl Carbine" desc = "A fully-loaded three-round burst carbine that uses 30-round 5.56mm magazines with a togglable underslung 40mm grenade launcher." @@ -128,6 +132,10 @@ var/list/uplink_items = list() gamemodes = list(/datum/game_mode/nuclear) surplus = 50 +/datum/uplink_item/dangerous/carbine/unrestricted + item = /obj/item/weapon/gun/projectile/automatic/m90/unrestricted + gamemodes = list(/datum/game_mode/gang) + /datum/uplink_item/dangerous/machinegun name = "L6 Squad Automatic Weapon" desc = "A fully-loaded Aussec Armoury belt-fed machine gun. This deadly weapon has a massive 50-round magazine of devastating 7.62x51mm ammunition." @@ -142,7 +150,7 @@ var/list/uplink_items = list() The bow generates bolts using an internal power source but must be manually charged between shots." item = /obj/item/weapon/gun/energy/kinetic_accelerator/crossbow cost = 12 - excludefrom = list(/datum/game_mode/nuclear) + excludefrom = list(/datum/game_mode/nuclear,/datum/game_mode/gang) surplus = 50 /datum/uplink_item/dangerous/flamethrower @@ -150,7 +158,7 @@ var/list/uplink_items = list() desc = "A flamethrower, fueled by a portion of highly flammable biotoxins stolen previously from Nanotrasen stations. Make a statement by roasting the filth in their own greed. Use with caution." item = /obj/item/weapon/flamethrower/full/tank cost = 11 - gamemodes = list(/datum/game_mode/nuclear) + gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) surplus = 40 /datum/uplink_item/dangerous/sword @@ -201,7 +209,7 @@ var/list/uplink_items = list() Use with extreme caution, to prevent exposure to yourself and your fellow operatives." item = /obj/item/weapon/reagent_containers/spray/chemsprayer/bioterror cost = 20 - gamemodes = list(/datum/game_mode/nuclear) + gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) surplus = 0 /datum/uplink_item/dangerous/gygax @@ -258,7 +266,7 @@ var/list/uplink_items = list() desc = "An additional 20-round .45 magazine for use in the C-20r submachine gun. These bullets pack a lot of punch that can knock most targets down, but do limited overall damage." item = /obj/item/ammo_box/magazine/smgm45 cost = 2 - gamemodes = list(/datum/game_mode/nuclear) + gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) /datum/uplink_item/ammo/bullbuck name = "Drum Magazine - 12g Buckshot" @@ -286,7 +294,7 @@ var/list/uplink_items = list() desc = "An additional 30-round 5.56 magazine for use in the M-90gl carbine. These bullets don't have the punch to knock most targets down, but dish out higher overall damage." item = /obj/item/ammo_box/magazine/m556 cost = 2 - gamemodes = list(/datum/game_mode/nuclear) + gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) /datum/uplink_item/ammo/a40mm name = "Ammo Box - 40mm grenades" @@ -330,6 +338,7 @@ var/list/uplink_items = list() item = /obj/item/weapon/gun/projectile/automatic/toy/pistol/riot cost = 10 surplus = 10 + excludefrom = list(/datum/game_mode/gang) /datum/uplink_item/stealthy_weapons/sleepy_pen name = "Sleepy Pen" @@ -337,7 +346,7 @@ var/list/uplink_items = list() The pen holds one dose of the mixture, and cannot be refilled." item = /obj/item/weapon/pen/sleepy cost = 4 - excludefrom = list(/datum/game_mode/nuclear) + excludefrom = list(/datum/game_mode/nuclear,/datum/game_mode/gang) /datum/uplink_item/stealthy_weapons/soap name = "Syndicate Soap" @@ -422,6 +431,7 @@ var/list/uplink_items = list() desc = "Projects an image across a user, disguising them as an object scanned with it, as long as they don't move the projector from their hand. The disguised user cannot run and rojectiles pass over them." item = /obj/item/device/chameleon cost = 7 + excludefrom = list(/datum/game_mode/gang) /datum/uplink_item/stealthy_tools/camera_bug name = "Camera Bug" @@ -454,6 +464,7 @@ var/list/uplink_items = list() desc = "The emag is a small card that unlocks hidden functions in electronic devices, subverts intended functions and characteristically breaks security mechanisms." item = /obj/item/weapon/card/emag cost = 6 + excludefrom = list(/datum/game_mode/gang) /datum/uplink_item/device_tools/toolbox name = "Full Syndicate Toolbox" @@ -467,7 +478,7 @@ var/list/uplink_items = list() and other medical supplies helpful for a medical field operative." item = /obj/item/weapon/storage/firstaid/tactical cost = 9 - gamemodes = list(/datum/game_mode/nuclear) + gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) /datum/uplink_item/badass/syndiecigs name = "Syndicate Smokes" @@ -480,6 +491,7 @@ var/list/uplink_items = list() desc = "The red and black syndicate space suit is less encumbering than Nanotrasen variants, fits inside bags, and has a weapon slot. Nanotrasen crewmembers are trained to report red space suit sightings." item = /obj/item/weapon/storage/box/syndie_kit/space cost = 5 + excludefrom = list(/datum/game_mode/gang) /datum/uplink_item/device_tools/hardsuit name = "Blood-red Hardsuit" @@ -489,6 +501,7 @@ var/list/uplink_items = list() Nanotrasen crewmembers are trained to report red space suit sightings, these suits in particular are known to drive employees into a panic." item = /obj/item/clothing/suit/space/hardsuit/syndi cost = 8 + excludefrom = list(/datum/game_mode/gang) /datum/uplink_item/device_tools/thermal name = "Thermal Imaging Glasses" @@ -553,6 +566,7 @@ var/list/uplink_items = list() leading to an emergency evacuation. Because of its size, it cannot be carried. Ordering this sends you a small beacon that will teleport the larger beacon to your location on activation." item = /obj/item/device/sbeacondrop cost = 14 + excludefrom = list(/datum/game_mode/gang) /datum/uplink_item/device_tools/syndicate_bomb name = "Syndicate Bomb" @@ -590,7 +604,7 @@ var/list/uplink_items = list() desc = "An incredibly useful personal shield projector, capable of reflecting energy projectiles and defending against other attacks." item = /obj/item/weapon/shield/energy cost = 16 - gamemodes = list(/datum/game_mode/nuclear) + gamemodes = list(/datum/game_mode/nuclear,/datum/game_mode/gang) surplus = 20 @@ -636,7 +650,7 @@ var/list/uplink_items = list() desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 10 telecrystals, but you do not know which specialisation you will receive." item = /obj/item/weapon/storage/box/syndicate cost = 20 - excludefrom = list(/datum/game_mode/nuclear) + excludefrom = list(/datum/game_mode/nuclear,/datum/game_mode/gang) /datum/uplink_item/badass/syndiecards name = "Syndicate Playing Cards" diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 5fe4cac6f8f..7639fbaca5f 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -88,6 +88,9 @@ burst_size = 2 pin = /obj/item/device/firing_pin/implant/pindicate +/obj/item/weapon/gun/projectile/automatic/c20r/unrestricted + pin = /obj/item/device/firing_pin + /obj/item/weapon/gun/projectile/automatic/c20r/New() ..() update_icon() @@ -175,6 +178,9 @@ fire_delay = 2 pin = /obj/item/device/firing_pin/implant/pindicate +/obj/item/weapon/gun/projectile/automatic/m90/unrestricted + pin = /obj/item/device/firing_pin + /obj/item/weapon/gun/projectile/automatic/m90/New() ..() underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src)