From aa01c30656579ce78925856694a23a5314f3e44e Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Mon, 30 Mar 2020 02:22:03 +1100 Subject: [PATCH] Removes some weapons and crates that shouldn't have been added, like, ever (#11673) --- code/modules/cargo/packs/armory.dm | 38 ----------------------------- code/modules/cargo/packs/science.dm | 29 ---------------------- 2 files changed, 67 deletions(-) diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index 664030da33..d832200201 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -164,17 +164,6 @@ /obj/item/shield/riot) crate_name = "riot shields crate" -/datum/supply_pack/security/armory/riotshotguns - name = "Riot Shotgun Crate" - desc = "For when the greytide gets really uppity. Contains three riot shotguns, seven rubber shot and beanbag shells. Requires Armory access to open." - cost = 6500 - contains = list(/obj/item/gun/ballistic/shotgun/riot, - /obj/item/gun/ballistic/shotgun/riot, - /obj/item/gun/ballistic/shotgun/riot, - /obj/item/storage/box/rubbershot, - /obj/item/storage/box/beanbag) - crate_name = "riot shotgun crate" - /datum/supply_pack/security/armory/russian name = "Russian Surplus Crate" desc = "Hello Comrade, we have the most modern russian military equipment the black market can offer, for the right price of course. Sadly we couldnt remove the lock so it requires Armory access to open." @@ -216,23 +205,6 @@ /obj/item/clothing/gloves/combat) crate_name = "swat crate" -/datum/supply_pack/security/armory/swattasers //Lesser AEG tbh - name = "SWAT tactical 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 = 7000 - 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/woodstock - name = "WoodStock Classic Shotguns Crate" - desc = "Contains three rustic, pumpaction shotguns. Requires Armory access to open." - cost = 3000 - contains = list(/obj/item/gun/ballistic/shotgun, - /obj/item/gun/ballistic/shotgun, - /obj/item/gun/ballistic/shotgun) - crate_name = "woodstock shotguns crate" - /datum/supply_pack/security/armory/wt550 name = "WT-550 Semi-Auto Rifle Crate" desc = "Contains two high-powered, semiautomatic rifles chambered in 4.6x30mm. Requires Armory access to open." @@ -260,13 +232,3 @@ /obj/item/ammo_box/magazine/wt550m9/wtrubber, /obj/item/ammo_box/magazine/wt550m9/wtrubber) crate_name = "auto rifle ammo crate" - -/datum/supply_pack/security/armory/wt550ammo_special - name = "WT-550 Semi-Auto SMG Special Ammo Crate" - desc = "Contains 2 20-round Armour Piercing and Incendiary magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open." - cost = 3000 - contains = list(/obj/item/ammo_box/magazine/wt550m9/wtap, - /obj/item/ammo_box/magazine/wt550m9/wtap, - /obj/item/ammo_box/magazine/wt550m9/wtic, - /obj/item/ammo_box/magazine/wt550m9/wtic) - crate_name = "auto rifle ammo crate" diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm index e6671a02ea..a3548a5eb6 100644 --- a/code/modules/cargo/packs/science.dm +++ b/code/modules/cargo/packs/science.dm @@ -108,17 +108,6 @@ /obj/item/clothing/gloves/color/latex/nitrile) crate_name = "nitrile gloves crate" -/datum/supply_pack/science/nuke_b_gone - name = "Nuke Defusal Kit" - desc = "Contains set of tools to defuse a nuke." - cost = 7500 //Useful for traitors/nukies that fucked up - dangerous = TRUE - hidden = TRUE - contains = list(/obj/item/nuke_core_container/nt, - /obj/item/screwdriver/nuke/nt, - /obj/item/paper/guides/nt/nuke_instructions) - crate_name = "safe defusal kit storage" - /datum/supply_pack/science/plasma name = "Plasma Assembly Crate" desc = "Everything you need to burn something to the ground, this contains three plasma assembly sets. Each set contains a plasma tank, igniter, proximity sensor, and timer! Warranty void if exposed to high temperatures. Requires Toxins access to open." @@ -191,17 +180,6 @@ crate_name = "slime core crate" crate_type = /obj/structure/closet/crate/secure/science -/datum/supply_pack/science/supermater - name = "Supermatter Extraction Tools Crate" - desc = "Contains a set of tools to extract a sliver of supermatter. Consult your CE today!" - cost = 7500 //Useful for traitors that fucked up - hidden = TRUE - contains = list(/obj/item/nuke_core_container/supermatter, - /obj/item/scalpel/supermatter, - /obj/item/hemostat/supermatter, - /obj/item/paper/guides/antag/supermatter_sliver) - crate_name = "supermatter extraction kit crate" - /datum/supply_pack/science/tablets name = "Tablet Crate" desc = "What's a computer? Contains five cargo tablets." @@ -224,10 +202,3 @@ crate_type = /obj/structure/closet/crate/secure/science dangerous = TRUE -/datum/supply_pack/science/tech_slugs - name = "Tech Slug Ammo Shells" - desc = "A new type of shell that is able to be made into a few different dangerous types. Contains two boxes of tech slugs, 14 shells in all." - cost = 1700 - contains = list(/obj/item/storage/box/techsslug, - /obj/item/storage/box/techsslug) - crate_name = "tech slug crate"