diff --git a/code/modules/cargo/goodies.dm b/code/modules/cargo/goodies.dm index 99597499c00..96a506086c8 100644 --- a/code/modules/cargo/goodies.dm +++ b/code/modules/cargo/goodies.dm @@ -73,6 +73,12 @@ access_view = ACCESS_ARMORY contains = list(/obj/item/ammo_box/magazine/wt550m9) +/datum/supply_pack/goody/wt550ammoap //SKYRAT EDIT ADDITION + +/datum/supply_pack/goody/wt550ammoic //SKYRAT EDIT ADDITION + +/datum/supply_pack/goody/techbox //SKYRAT EDIT ADDITION + /datum/supply_pack/goody/sologamermitts name = "Insulated Gloves Single-Pack" desc = "The backbone of modern society. Barely ever ordered for actual engineering." diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a29c93fe6a1..189a893921a 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -551,6 +551,8 @@ /obj/item/ammo_box/c38/trac) crate_name = "tracking implant crate" +/datum/supply_pack/security/armory/riotshotguns //SKYRAT EDIT ADDITION + /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." @@ -613,6 +615,8 @@ var/item = pick(contains) new item(C) +/datum/supply_pack/security/armory/mafia //SKYRAT EDIT ADDITION + /datum/supply_pack/security/armory/swat name = "SWAT Crate" desc = "Contains two fullbody sets of tough, fireproof, pressurized suits designed in a joint effort by IS-ERI and Nanotrasen. Each set contains a suit, helmet, mask, combat belt, and combat gloves. Requires Armory access to open." @@ -629,6 +633,8 @@ /obj/item/clothing/gloves/tackler/combat) crate_name = "swat crate" +/datum/supply_pack/security/armory/woodstock //SKYRAT EDIT ADDITION + /datum/supply_pack/security/armory/wt550 name = "WT-550 Auto Rifle Crate" desc = "Contains two high-powered, semiautomatic rifles chambered in 4.6x30mm. Requires Armory access to open." @@ -646,6 +652,7 @@ /obj/item/ammo_box/magazine/wt550m9, /obj/item/ammo_box/magazine/wt550m9) +/datum/supply_pack/security/armory/wt550ammovariety //SKYRAT EDIT ADDITION ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Engineering ///////////////////////////////////// @@ -1413,6 +1420,8 @@ crate_name = "shield generators crate" crate_type = /obj/structure/closet/crate/secure/science +/datum/supply_pack/science/techshellpack //SKYRAT EDIT ADDITION + /datum/supply_pack/science/transfer_valves name = "Tank Transfer Valves Crate" desc = "The key ingredient for making a lot of people very angry very fast. Contains two tank transfer valves. Requires RD access to open." diff --git a/modular_skyrat/master_files/code/game/objects/items/storage/boxes.dm b/modular_skyrat/master_files/code/game/objects/items/storage/boxes.dm new file mode 100644 index 00000000000..fc9b2783a10 --- /dev/null +++ b/modular_skyrat/master_files/code/game/objects/items/storage/boxes.dm @@ -0,0 +1,9 @@ +//Most of these are just additions to allow certain cargo packs to exist. More will be on the way on additional PR's + +/obj/item/storage/box/techshell + name = "Box of Unloaded Techshell" + desc = "A box of Technological Shells. These come unloaded and ready for custom shot loads." + +/obj/item/storage/box/techshell/PopulateContents() + for(var/i in 1 to 7) + new /obj/item/ammo_casing/shotgun/techshell(src) diff --git a/modular_skyrat/modules/cargo/code/bloat.dm b/modular_skyrat/modules/cargo/code/bloat.dm new file mode 100644 index 00000000000..a295434ec6d --- /dev/null +++ b/modular_skyrat/modules/cargo/code/bloat.dm @@ -0,0 +1,121 @@ +//These are currently code in as a complete fucking mess. Remind me to organize later. Courtesy of ZenithEevee + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Armory ////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/security/armory/riotshotguns + name = "Peacekeeper Shotgun Crate" + desc = "For when the peace needs kept, and you're all out of gum. Contains 3 Peacekeeper shotguns and some non-lethal shells." + cost = CARGO_CRATE_VALUE * 13.25 + contains = list(/obj/item/gun/ballistic/shotgun/riot, + /obj/item/gun/ballistic/shotgun/riot, + /obj/item/gun/ballistic/shotgun/riot, + /obj/item/storage/box/beanbag, + /obj/item/storage/box/rubbershot) + crate_name = "peacekeeper shotgun crate" + +/datum/supply_pack/security/armory/woodstock + name = "Woodstock Originals Crate" + desc = "For when Oldschool is Cool... Or the Bartender looses their gun. again. Contains 3 woodstock shotguns" + cost = CARGO_CRATE_VALUE * 9.5 + contains = list(/obj/item/gun/ballistic/shotgun, + /obj/item/gun/ballistic/shotgun, + /obj/item/gun/ballistic/shotgun) + crate_name = "woodstock crate" + +/datum/supply_pack/security/armory/wt550ammovariety + name = "WT-550 Auto Rifle Ammo Variety Crate" + desc = "AI Gone rogue and blow the Security Lathe? Anti-Corporate scum steal it? Doesn't matter, we got you covered. Contains 2 of each magazine type for the WT550 Auto Rifle." + cost = CARGO_CRATE_VALUE * 4.5 + contains = list(/obj/item/ammo_box/magazine/wt550m9, + /obj/item/ammo_box/magazine/wt550m9, + /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 = "WT550 Ammo Variety Pack" + +/datum/supply_pack/security/armory/mafia //I am a bit iffy on this one. The tommy gun has a fairly good shot-rate. Pack is designed to be used as a bundle of 22 5k briefcases, emag + agent ID with 2 TC to spare + name = "Secretkeeper Supply Crate" + desc = "Aye... Lend an ear... Send us the money, And we do you a favour... A Tommygun, a set of clothing to dissapear, and a bodybag for a... Shallow grave... Keep it a secret, Capiche?" + hidden = TRUE + cost = 100000 //this is going to stay 100000, As it is implied to be used with the traitor cash briefcase + contains = list(/obj/item/gun/ballistic/automatic/tommygun, + /obj/item/clothing/head/fedora, + /obj/item/clothing/under/rank/civilian/bartender, + /obj/item/clothing/accessory/waistcoat, + /obj/item/clothing/neck/tie/black, + /obj/item/clothing/shoes/jackboots, + /obj/item/clothing/suit/det_suit/grey, + /obj/item/clothing/mask/bandana/black, + /obj/item/clothing/glasses/sunglasses, + /obj/item/bodybag/bluespace) + crate_name = "unmarked crate" + crate_type = /obj/structure/closet/crate/secure/weapon + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Science ///////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/science/techshellpack + name = "Techshell Value Pack" + desc = "Are beanbags, rubbershot, lethals and slugs not doing it for you? This pack contains 3 boxes of 7 unloaded techshells, just begging to be loaded with various dangerous materials!" + cost = CARGO_CRATE_VALUE * 10.5 //this should be rougly 2100 if my calculations are correct + contains = list(/obj/item/storage/box/techshell, + /obj/item/storage/box/techshell, + /obj/item/storage/box/techshell) + crate_name = "techshell value pack" + crate_type = /obj/structure/closet/crate/science + +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////// Service ////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +//disabled temporarily, expect to be back later. +/* +/datum/supply_pack/service/hydrohelper + name = "Hydro-Helper Circuit Pack" + desc = "Botany being lazy with something? Being refused circuit boards? Wanting to start your own Gaiatic garden? This pack contains 3 Hydroponic tray circuit boards, a biogenerator circuit board, and a seed extractor circuit board! (Parts and matterials not included)" + cost = 1500 + contains = list(/obj/item/circuitboard/machine/hydroponics, + /obj/item/circuitboard/machine/hydroponics, + /obj/item/circuitboard/machine/hydroponics, + /obj/item/circuitboard/machine/biogenerator, + /obj/item/circuitboard/machine/seed_extractor) + crate_name = "hydro-helper circuit pack" + crate_type = /obj/structure/closet/crate/hydroponics +*/ + +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////// Goodies ////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/goody/wt550ammoic + name = "WT-550 Auto Rifle Incendiary Ammo Single Pack" + desc = "Contains a 20-round magazine of Incendiary bullets for the WT-550 Auto Rifle. Just dont tell anyone you bought this." + cost = PAYCHECK_HARD * 7 + contraband = TRUE + contains = list(/obj/item/ammo_box/magazine/wt550m9/wtic) + +/datum/supply_pack/goody/wt550ammoap + name = "WT-550 Auto Rifle Armor-Piercing Ammo Single Pack" + desc = "Contains a 20-round magazine of Armor-Piercing bullets for the WT-550 Auto Rifle. Just dont tell anyone you bought this." + cost = PAYCHECK_HARD * 7 + contraband = TRUE + contains = list(/obj/item/ammo_box/magazine/wt550m9/wtap) + +/datum/supply_pack/goody/EgunPDW + name = "Energy PDW Single Pack" + desc = "Maintenance a bit shady? Want a personal gun for when assistants get rowdy? This pack contains 1 Miniature Energy Gun, Perfect for detering absolutely no one, But its a mini Energy gun, Cmon!" + cost = PAYCHECK_HARD * 9 + access_view = ACCESS_ARMORY + contains = list(/obj/item/gun/energy/e_gun/mini) + +/datum/supply_pack/goody/techbox + name = "Techshell Single Pack" + desc = "Are beanbags, rubbershot, lethals and slugs not doing it for you? This contains 1 box of 7 unloaded techshells. Have fun wrecking havoc!" + cost = PAYCHECK_HARD * 8.5 + access_view = ACCESS_ARMORY + contains = list(/obj/item/storage/box/techshell) + diff --git a/tgstation.dme b/tgstation.dme index 6567b023c98..7ad02643b2d 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3330,6 +3330,7 @@ #include "modular_skyrat\master_files\code\game\objects\items\oxygen_candle.dm" #include "modular_skyrat\master_files\code\game\objects\items\devices\radio\encryption_key.dm" #include "modular_skyrat\master_files\code\game\objects\items\devices\radio\headset.dm" +#include "modular_skyrat\master_files\code\game\objects\items\storage\boxes.dm" #include "modular_skyrat\master_files\code\game\objects\structures\sauna_oven.dm" #include "modular_skyrat\master_files\code\game\objects\structures\trash_pile.dm" #include "modular_skyrat\master_files\code\modules\clothing\anthro_clothes.dm" @@ -3427,6 +3428,7 @@ #include "modular_skyrat\modules\blueshield\code\modules\projectiles\guns\energy\special.dm" #include "modular_skyrat\modules\cargo\code\goodies.dm" #include "modular_skyrat\modules\cargo\code\packs.dm" +#include "modular_skyrat\modules\cargo\code\bloat.dm" #include "modular_skyrat\modules\cloning\code\_DEFINES\access.dm" #include "modular_skyrat\modules\cloning\code\_DEFINES\DNA.dm" #include "modular_skyrat\modules\cloning\code\_DEFINES\machines.dm"