From 9d15665cbb837fbadb38ff064c92ea3f86f3da30 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 20 Mar 2019 17:12:05 -0400 Subject: [PATCH 1/4] Update packs.dm --- code/modules/cargo/packs.dm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a9972ca2d4..a895b31f68 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -512,6 +512,14 @@ /obj/item/storage/belt/bandolier) crate_name = "combat shotguns crate" +/datum/supply_pack/security/armory/dragnetgun + name = "DRAGnet gun Crate" + desc = "Contains two DRAGnet gun. A Dynamic Rapid-Apprehension of the Guilty net the revolution in law enforcement technology that YOU Want! Requires Armory access to open." + cost = 3500 + contains = list(/obj/item/gun/energy/e_gun/dragnet, + /obj/item/gun/energy/e_gun/dragnet) + crate_name = "anit riot net guns crate" + /datum/supply_pack/security/armory/energy name = "Energy Guns Crate" desc = "Contains three Energy Guns, capable of firing both nonlethal and lethal blasts of light. Requires Armory access to open." @@ -559,6 +567,16 @@ crate_type = /obj/structure/closet/crate/secure/plasma dangerous = TRUE +/datum/supply_pack/security/armory/miniguns + name = "Personal Miniature Energy Guns" + desc = "Contains three miniature energy guns. Each gun has a dislaber and a lethal option. Requires Armory access to open." + cost = 5000 + contains = list(/obj/item/gun/energy/e_gun/mini, + /obj/item/gun/energy/e_gun/mini, + /obj/item/gun/energy/e_gun/mini) + crate_name = "personal engery guns crate" + crate_type = /obj/structure/closet/crate/secure/plasma + /datum/supply_pack/security/armory/laserarmor name = "Reflector Vest Crate" desc = "Contains two vests of highly reflective material. Each armor piece diffuses a laser's energy by over half, as well as offering a good chance to reflect the laser entirely. Requires Armory access to open." @@ -620,6 +638,13 @@ /obj/item/clothing/gloves/combat) crate_name = "swat crate" +/datum/supply_pack/security/armory/swattasers //Lesser AEG tbh + name = "SWAT tatical tasers Crate" + desc = "Contains two tactical energy gun, these guns are able to tase, dislabe and lethal as well as hold a seclight. Requires Armory access to open." + cost = 8000 + contains = list(obj/item/gun/energy/e_gun/stun, + obj/item/gun/energy/e_gun/stun) + crate_name = "swat taser crate" /datum/supply_pack/security/armory/wt550 name = "WT-550 Semi-Auto Rifle Crate" From 978b5261ceefe3e63762107e60df85f36d5614ce Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 20 Mar 2019 20:54:34 -0400 Subject: [PATCH 2/4] Update packs.dm --- code/modules/cargo/packs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a895b31f68..296bdb68cd 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -640,7 +640,7 @@ /datum/supply_pack/security/armory/swattasers //Lesser AEG tbh name = "SWAT tatical tasers Crate" - desc = "Contains two tactical energy gun, these guns are able to tase, dislabe and lethal as well as hold a seclight. Requires Armory access to open." + desc = "Contains two tactical energy gun, these guns are able to tase, disable and lethal as well as hold a seclight. Requires Armory access to open." cost = 8000 contains = list(obj/item/gun/energy/e_gun/stun, obj/item/gun/energy/e_gun/stun) From bf1c8a5e7dbc166a68afcfe486468a2cc8f5b988 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Wed, 20 Mar 2019 21:09:40 -0400 Subject: [PATCH 3/4] LOCAL CAT CANT DO ANYTHING CORRECT --- code/modules/cargo/packs.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 296bdb68cd..8c18786aa0 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -642,8 +642,8 @@ name = "SWAT tatical tasers Crate" desc = "Contains two tactical energy gun, these guns are able to tase, disable and lethal as well as hold a seclight. Requires Armory access to open." cost = 8000 - contains = list(obj/item/gun/energy/e_gun/stun, - obj/item/gun/energy/e_gun/stun) + contains = list(/obj/item/gun/energy/e_gun/stun, + /obj/item/gun/energy/e_gun/stun) crate_name = "swat taser crate" /datum/supply_pack/security/armory/wt550 From 0504f2e02ac600eedc3c4eb0e9e7e184c5875f4d Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 24 Mar 2019 10:34:35 -0400 Subject: [PATCH 4/4] Update packs.dm --- code/modules/cargo/packs.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 8c18786aa0..d76edf2e10 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -518,7 +518,7 @@ cost = 3500 contains = list(/obj/item/gun/energy/e_gun/dragnet, /obj/item/gun/energy/e_gun/dragnet) - crate_name = "anit riot net guns crate" + crate_name = "anti riot net guns crate" /datum/supply_pack/security/armory/energy name = "Energy Guns Crate" @@ -553,7 +553,7 @@ /datum/supply_pack/security/armory/fire name = "Incendiary Weapons Crate" - desc = "Burn, baby burn. Contains three incendiary grenades, three plasma canisters, and a flamethrower. Requires Armory access to open." + desc = "Burn, baby burn. Contains three incendiary grenades, three plasma canisters, and a flamethrower. Requires Brige access to open." cost = 1500 access = ACCESS_HEADS contains = list(/obj/item/flamethrower/full, @@ -569,12 +569,12 @@ /datum/supply_pack/security/armory/miniguns name = "Personal Miniature Energy Guns" - desc = "Contains three miniature energy guns. Each gun has a dislaber and a lethal option. Requires Armory access to open." + desc = "Contains three miniature energy guns. Each gun has a disabler and a lethal option. Requires Armory access to open." cost = 5000 contains = list(/obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/e_gun/mini) - crate_name = "personal engery guns crate" + crate_name = "personal energy guns crate" crate_type = /obj/structure/closet/crate/secure/plasma /datum/supply_pack/security/armory/laserarmor