From 7e333b5aa731587fdac7ccb87e114734403b477c Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 3 Nov 2018 21:22:44 -0400 Subject: [PATCH 01/10] Many goodies --- code/modules/cargo/packs.dm | 177 ++++++++++++++++++++++++++++++++++-- 1 file changed, 170 insertions(+), 7 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index bb5e474f82..2dce2847fb 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -38,6 +38,7 @@ new item(C) // If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal +//A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z <-- For quick and easy references ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Emergency /////////////////////////////////////// @@ -408,6 +409,13 @@ /obj/item/clothing/head/helmet/alt) crate_name = "bulletproof helmet crate" +/datum/supply_pack/security/armory/chemimp + name = "Chemical Implants Crate" + desc = "Contains five Remote Chemical implants. Requires Armory access to open." + cost = 2000 + contains = list(/obj/item/storage/box/chemimp) + crate_name = "chemical implant crate" + /datum/supply_pack/security/armory/combatknives name = "Combat Knives Crate" desc = "Contains three sharpened combat knives. Each knife guaranteed to fit snugly inside any Nanotrasen-standard boot. Requires Armory access to open." @@ -439,13 +447,6 @@ crate_name = "energy gun crate" crate_type = /obj/structure/closet/crate/secure/plasma -/datum/supply_pack/security/armory/chemimp - name = "Chemical Implants Crate" - desc = "Contains five Remote Chemical implants. Requires Armory access to open." - cost = 2000 - contains = list(/obj/item/storage/box/chemimp) - crate_name = "chemical implant crate" - /datum/supply_pack/security/armory/exileimp // Theres boxes in 2 lockers as well as gateway never realy being used sad name = "Exile Implants Crate" desc = "Contains five Exile implants. Requires Armory access to open." @@ -519,6 +520,15 @@ /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. Requires Armory access to open." + cost = 6000 + contains = list(/obj/item/gun/ballistic/shotgun/riot, + /obj/item/gun/ballistic/shotgun/riot, + /obj/item/gun/ballistic/shotgun/riot) + crate_name = "riot shotgun crate" + /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." @@ -2182,6 +2192,55 @@ crate_name = "art supply crate" crate_type = /obj/structure/closet/crate/wooden +/datum/supply_pack/misc/captain_pen + name = "Captain Pen" + desc = "A spare Captaun fountain pen." + access = ACCESS_CAPTAIN + cost = 25000 + contains = list(/obj/item/pen/fountain/captain) + crate_name = "captain pen" + crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen + +/datum/supply_pack/misc/captain_headset + name = "Captain Headset Key" + desc = "A spare Captain headset key, just in case The Captain ''lost'' it again." + access = ACCESS_CAPTAIN + cost = 20000 + contains = list(/obj/item/encryptionkey/heads/captain) + crate_name = "captain headset key" + crate_type = /obj/structure/closet/crate/secure/weapon + +/datum/supply_pack/misc/cargo_headsets + name = "Cargo Headset Keys" + desc = "Five Headset Keys for Cargo Techs. To help yell at miners for more plasma to sell." + access = ACCESS_CARGO + cost = 2500 + contains = list(/obj/item/encryptionkey/headset_cargo, + /obj/item/encryptionkey/headset_cargo, + /obj/item/encryptionkey/headset_cargo, + /obj/item/encryptionkey/headset_cargo, + /obj/item/encryptionkey/headset_cargo) + crate_name = "cargo headset keys" + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/misc/ce_headset + name = "Chief Engineer Headset Key" + desc = "A spare CE headset key. For when the CE throws there key into the SM again." + access = ACCESS_CE + cost = 10000 + contains = list(/obj/item/encryptionkey/heads/ce) + crate_name = "chief engineer headset key" + crate_type = /obj/structure/closet/crate/secure/weapon + +/datum/supply_pack/misc/cmo_headset + name = "Chief Medical Officer Headset Key" + desc = "A spare CMO headset key, For when the CMO's headset gets stollen well they do Genetics." + access = ACCESS_CMO + cost = 10000 + contains = list(/obj/item/encryptionkey/heads/cmo) + crate_name = "chief medical officer headset key" + crate_type = /obj/structure/closet/crate/secure/weapon + /datum/supply_pack/misc/bicycle name = "Bicycle" desc = "Nanotrasen reminds all employees to never toy with powers outside their control." @@ -2251,6 +2310,19 @@ crate_type = /obj/structure/closet/crate/wooden crate_name = "calligraphy crate" +/datum/supply_pack/misc/eng_headsets + name = "Engineering Headset Keys" + desc = "Five Headset Keys for Station Engineer. For the SM Alarm to yell into well people lick it." + access = ACCESS_ENGINE_EQUIP + cost = 2500 + contains = list(/obj/item/encryptionkey/headset_eng, + /obj/item/encryptionkey/headset_eng, + /obj/item/encryptionkey/headset_eng, + /obj/item/encryptionkey/headset_eng, + /obj/item/encryptionkey/headset_eng) + crate_name = "engineering headset keys" + crate_type = /obj/structure/closet/crate/secure/engineering + /datum/supply_pack/misc/wrapping_paper name = "Festive Wrapping Paper Crate" desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, the Clown's severed head? You can do all that, with this crate full of wrapping paper." @@ -2271,6 +2343,72 @@ crate_name = "coffin" crate_type = /obj/structure/closet/crate/coffin +/datum/supply_pack/misc/hos_headset + name = "Head Of Security Headset Key" + desc = "A spare HOS headset key, For when the HOS's headset is being used by a Changling." + access = ACCESS_HOS + cost = 10000 + contains = list(/obj/item/encryptionkey/heads/hos) + crate_name = "head of security headset key" + crate_type = /obj/structure/closet/crate/secure/weapon + +/datum/supply_pack/misc/hop_headset + name = "Head Of Personnel Headset Key" + desc = "A spare HOP headset key, For when the HOP's headset is being used by a Traitor." + access = ACCESS_HOP + cost = 10000 + contains = list(/obj/item/encryptionkey/heads/hop) + crate_name = "head of personnel headset key" + crate_type = /obj/structure/closet/crate/secure/weapon + +/datum/supply_pack/misc/medical_headsets + name = "Medical Headset Keys" + desc = "Five Headset Keys for Medical. To hear Medibot save dieing people or to yell at genetics to clone some one." + access = ACCESS_MEDICAL + cost = 2500 + contains = list(/obj/item/encryptionkey/headset_med, + /obj/item/encryptionkey/headset_med, + /obj/item/encryptionkey/headset_med, + /obj/item/encryptionkey/headset_med, + /obj/item/encryptionkey/headset_med) + crate_name = "medical headset keys" + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/misc/medsci_headsets + name = "Med Sci Headset Keys" + desc = "Three Headset Keys for ''Genetics''. To be yelled at for not cloning somone just to be yelled at for cloning them! Also get yelled at for being in sci, well having access." + access = ACCESS_GENETICS + cost = 7500 + contains = list( + /obj/item/encryptionkey/headset_medsci, + /obj/item/encryptionkey/headset_medsci, + /obj/item/encryptionkey/headset_medsci) + crate_name = "med sci headset keys" + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/misc/miner_headsets + name = "Miner Headset Keys" + desc = "Three Headset Keys for Miners. To hear Cargo and Sci yell at you for mats." + access = ACCESS_MINING + cost = 5000 //You can buy three miner starter kits and get this + all those goodies + contains = list( + /obj/item/encryptionkey/headset_mining, + /obj/item/encryptionkey/headset_mining, + /obj/item/encryptionkey/headset_mining) + crate_name = "miner headset keys" + crate_type = /obj/structure/closet/crate/secure + +/*Todo Add in a QM headset +/datum/supply_pack/misc/qm_headser + name = "QM, Headset Key" + desc = "A spare QM headset key, To yell at Miners and Command for things to sell." + access = ACCESS_QM + cost = 10000 + contains = list() + crate_name = "QM Headset Key" + crate_type = /obj/structure/closet/crate/secure/weapon +*/ + /datum/supply_pack/misc/religious_supplies name = "Religious Supplies Crate" desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." @@ -2284,6 +2422,31 @@ ) crate_name = "religious supplies crate" +/datum/supply_pack/misc/sci_headsets + name = "Sci Headset Keys" + desc = "Five Headset Keys for Sci. To yell at miners to get mats, then to yell at genetics for powers." + access = ACCESS_TOX //So no robotics open it + cost = 2500 + contains = list(/obj/item/encryptionkey/headset_sci, + /obj/item/encryptionkey/headset_sci, + /obj/item/encryptionkey/headset_sci, + /obj/item/encryptionkey/headset_sci, + /obj/item/encryptionkey/headset_sci) + crate_name = "sci headset keys" + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/misc/service_headsets + name = "Service Headset Keys" + desc = "Five Headset Keys for Service crewmembers to never use" + cost = 700 // No one uses them + contains = list(/obj/item/encryptionkey/headset_service, + /obj/item/encryptionkey/headset_service, + /obj/item/encryptionkey/headset_service, + /obj/item/encryptionkey/headset_service, + /obj/item/encryptionkey/headset_service) + crate_name = "never used headset keys" // There basically surpluses + crate_type = /obj/structure/closet/crate + /datum/supply_pack/misc/toner name = "Toner Crate" desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'" From 98b714ab407445c0ddf6b518d364b91ca45b27e0 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 3 Nov 2018 21:51:18 -0400 Subject: [PATCH 02/10] Lewd stuffs `Oh no` --- code/modules/cargo/packs.dm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 2dce2847fb..45cb99c1ce 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2447,6 +2447,34 @@ crate_name = "never used headset keys" // There basically surpluses crate_type = /obj/structure/closet/crate +datum/supply_pack/misc/lewd + name = "Lewd Crate" // OwO + desc = "Psss want to have a good time with your sluts? Well I got what you want maid clothing, dildos, collars and more!" + cost = 5000 + contraband = TRUE + contains = list(obj/item/dildo/custom, + obj/item/dildo/custom, + /obj/item/vending_refill/kink, + /obj/item/vending_refill/kink, + /obj/item/clothing/under/maid, + /obj/item/clothing/under/maid, + /obj/item/electropack/shockcollar, + /obj/item/electropack/shockcollar, + /obj/item/restraints/handcuffs/fake/kinky, + /obj/item/restraints/handcuffs/fake/kinky, + /obj/structure/reagent_dispensers/keg/aphro) + crate_name = "lewd kit" + crate_type = /obj/structure/closet/crate + +datum/supply_pack/misc/lewdkeg + name = "Lewd Deluxe Keg" + desc = "That other stuff not getting you ready? Well I have a Chemslut making tons of the good stuff." + cost = 7000 //It can be a weapon + contraband = TRUE + contains = list(/obj/structure/reagent_dispensers/keg/aphro/strong) + crate_name = "deluxe keg" + crate_type = /obj/structure/closet/crate + /datum/supply_pack/misc/toner name = "Toner Crate" desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'" From 31cbb5caa8301c71373fe8c62c8a7e7f0d041b9b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 3 Nov 2018 22:08:58 -0400 Subject: [PATCH 03/10] Adds in Knifes and fixes Lewd crates --- code/modules/cargo/packs.dm | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 45cb99c1ce..b18e248cc6 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1551,6 +1551,33 @@ crate_name = "beekeeping starter crate" crate_type = /obj/structure/closet/crate/hydroponics +/datum/supply_pack/organic/cutlery + name = "Kitchen Cutlery Deluxe Set" + desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! Form a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal." + cost = 25000 + contraband = TRUE + contains = list(/obj/item/sharpener, + /obj/item/kitchen/fork, + /obj/item/kitchen/fork, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife/butcher, + /obj/item/kitchen/knife/butcher, + /obj/item/kitchen/rollingpin, //Deluxe for a reason + /obj/item/trash/plate, + /obj/item/trash/plate, + /obj/item/trash/plate, + /obj/item/trash/plate, + /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/reagent_containers/food/drinks/drinkingglass. + /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, + /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass) + crate_name = "kitchen cutlery deluxe set" + dangerous = TRUE //We want Admins to know of this + /datum/supply_pack/organic/food name = "Food Crate" desc = "Get things cooking with this crate full of useful ingredients! Contains a two dozen eggs, three bananas, and two bags of flour and rice, two cartons of milk, soymilk, as well as salt and pepper shakers, a enzyme and sugar bottle, and three slabs of monkeymeat." @@ -2452,8 +2479,8 @@ datum/supply_pack/misc/lewd desc = "Psss want to have a good time with your sluts? Well I got what you want maid clothing, dildos, collars and more!" cost = 5000 contraband = TRUE - contains = list(obj/item/dildo/custom, - obj/item/dildo/custom, + contains = list(obj/item/dildo, + obj/item/dildo, /obj/item/vending_refill/kink, /obj/item/vending_refill/kink, /obj/item/clothing/under/maid, From edcbad3ecbfc63b8951da488f89412db21bd64ad Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 3 Nov 2018 22:14:36 -0400 Subject: [PATCH 04/10] Adds in kitty ears and fixs a misstake --- code/modules/cargo/packs.dm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index b18e248cc6..77ba753c16 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1572,7 +1572,7 @@ /obj/item/trash/plate, /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/reagent_containers/food/drinks/drinkingglass, - /obj/item/reagent_containers/food/drinks/drinkingglass. + /obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass) crate_name = "kitchen cutlery deluxe set" @@ -2479,8 +2479,8 @@ datum/supply_pack/misc/lewd desc = "Psss want to have a good time with your sluts? Well I got what you want maid clothing, dildos, collars and more!" cost = 5000 contraband = TRUE - contains = list(obj/item/dildo, - obj/item/dildo, + contains = list(/obj/item/dildo/custom, + /obj/item/dildo/custom, /obj/item/vending_refill/kink, /obj/item/vending_refill/kink, /obj/item/clothing/under/maid, @@ -2489,6 +2489,8 @@ datum/supply_pack/misc/lewd /obj/item/electropack/shockcollar, /obj/item/restraints/handcuffs/fake/kinky, /obj/item/restraints/handcuffs/fake/kinky, + /obj/item/clothing/head/kitty/genuine, // Why its illegal + /obj/item/clothing/head/kitty/genuine, /obj/structure/reagent_dispensers/keg/aphro) crate_name = "lewd kit" crate_type = /obj/structure/closet/crate From c3b0a1d94307666b63ee319164b4719a396492ad Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 8 Nov 2018 19:18:36 -0500 Subject: [PATCH 05/10] Removes the bloat --- code/modules/cargo/packs.dm | 76 ------------------------------------- 1 file changed, 76 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 77ba753c16..3504ce2210 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2237,19 +2237,6 @@ crate_name = "captain headset key" crate_type = /obj/structure/closet/crate/secure/weapon -/datum/supply_pack/misc/cargo_headsets - name = "Cargo Headset Keys" - desc = "Five Headset Keys for Cargo Techs. To help yell at miners for more plasma to sell." - access = ACCESS_CARGO - cost = 2500 - contains = list(/obj/item/encryptionkey/headset_cargo, - /obj/item/encryptionkey/headset_cargo, - /obj/item/encryptionkey/headset_cargo, - /obj/item/encryptionkey/headset_cargo, - /obj/item/encryptionkey/headset_cargo) - crate_name = "cargo headset keys" - crate_type = /obj/structure/closet/crate/secure - /datum/supply_pack/misc/ce_headset name = "Chief Engineer Headset Key" desc = "A spare CE headset key. For when the CE throws there key into the SM again." @@ -2337,19 +2324,6 @@ crate_type = /obj/structure/closet/crate/wooden crate_name = "calligraphy crate" -/datum/supply_pack/misc/eng_headsets - name = "Engineering Headset Keys" - desc = "Five Headset Keys for Station Engineer. For the SM Alarm to yell into well people lick it." - access = ACCESS_ENGINE_EQUIP - cost = 2500 - contains = list(/obj/item/encryptionkey/headset_eng, - /obj/item/encryptionkey/headset_eng, - /obj/item/encryptionkey/headset_eng, - /obj/item/encryptionkey/headset_eng, - /obj/item/encryptionkey/headset_eng) - crate_name = "engineering headset keys" - crate_type = /obj/structure/closet/crate/secure/engineering - /datum/supply_pack/misc/wrapping_paper name = "Festive Wrapping Paper Crate" desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, the Clown's severed head? You can do all that, with this crate full of wrapping paper." @@ -2388,19 +2362,6 @@ crate_name = "head of personnel headset key" crate_type = /obj/structure/closet/crate/secure/weapon -/datum/supply_pack/misc/medical_headsets - name = "Medical Headset Keys" - desc = "Five Headset Keys for Medical. To hear Medibot save dieing people or to yell at genetics to clone some one." - access = ACCESS_MEDICAL - cost = 2500 - contains = list(/obj/item/encryptionkey/headset_med, - /obj/item/encryptionkey/headset_med, - /obj/item/encryptionkey/headset_med, - /obj/item/encryptionkey/headset_med, - /obj/item/encryptionkey/headset_med) - crate_name = "medical headset keys" - crate_type = /obj/structure/closet/crate/secure - /datum/supply_pack/misc/medsci_headsets name = "Med Sci Headset Keys" desc = "Three Headset Keys for ''Genetics''. To be yelled at for not cloning somone just to be yelled at for cloning them! Also get yelled at for being in sci, well having access." @@ -2413,18 +2374,6 @@ crate_name = "med sci headset keys" crate_type = /obj/structure/closet/crate/secure -/datum/supply_pack/misc/miner_headsets - name = "Miner Headset Keys" - desc = "Three Headset Keys for Miners. To hear Cargo and Sci yell at you for mats." - access = ACCESS_MINING - cost = 5000 //You can buy three miner starter kits and get this + all those goodies - contains = list( - /obj/item/encryptionkey/headset_mining, - /obj/item/encryptionkey/headset_mining, - /obj/item/encryptionkey/headset_mining) - crate_name = "miner headset keys" - crate_type = /obj/structure/closet/crate/secure - /*Todo Add in a QM headset /datum/supply_pack/misc/qm_headser name = "QM, Headset Key" @@ -2449,31 +2398,6 @@ ) crate_name = "religious supplies crate" -/datum/supply_pack/misc/sci_headsets - name = "Sci Headset Keys" - desc = "Five Headset Keys for Sci. To yell at miners to get mats, then to yell at genetics for powers." - access = ACCESS_TOX //So no robotics open it - cost = 2500 - contains = list(/obj/item/encryptionkey/headset_sci, - /obj/item/encryptionkey/headset_sci, - /obj/item/encryptionkey/headset_sci, - /obj/item/encryptionkey/headset_sci, - /obj/item/encryptionkey/headset_sci) - crate_name = "sci headset keys" - crate_type = /obj/structure/closet/crate/secure - -/datum/supply_pack/misc/service_headsets - name = "Service Headset Keys" - desc = "Five Headset Keys for Service crewmembers to never use" - cost = 700 // No one uses them - contains = list(/obj/item/encryptionkey/headset_service, - /obj/item/encryptionkey/headset_service, - /obj/item/encryptionkey/headset_service, - /obj/item/encryptionkey/headset_service, - /obj/item/encryptionkey/headset_service) - crate_name = "never used headset keys" // There basically surpluses - crate_type = /obj/structure/closet/crate - datum/supply_pack/misc/lewd name = "Lewd Crate" // OwO desc = "Psss want to have a good time with your sluts? Well I got what you want maid clothing, dildos, collars and more!" From 8dd2dbef61ba0e44cceb51786d7c7bce6e6aef6f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 10 Nov 2018 00:23:48 -0500 Subject: [PATCH 06/10] Better? --- code/modules/cargo/packs.dm | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 3504ce2210..661f951469 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -38,7 +38,6 @@ new item(C) // If you add something to this list, please group it by type and sort it alphabetically instead of just jamming it in like an animal -//A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U, V, W, X, Y, Z <-- For quick and easy references ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Emergency /////////////////////////////////////// @@ -1554,7 +1553,7 @@ /datum/supply_pack/organic/cutlery name = "Kitchen Cutlery Deluxe Set" desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! Form a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal." - cost = 25000 + cost = 10000 contraband = TRUE contains = list(/obj/item/sharpener, /obj/item/kitchen/fork, @@ -1576,7 +1575,6 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass) crate_name = "kitchen cutlery deluxe set" - dangerous = TRUE //We want Admins to know of this /datum/supply_pack/organic/food name = "Food Crate" @@ -2223,7 +2221,7 @@ name = "Captain Pen" desc = "A spare Captaun fountain pen." access = ACCESS_CAPTAIN - cost = 25000 + cost = 10000 contains = list(/obj/item/pen/fountain/captain) crate_name = "captain pen" crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen @@ -2232,7 +2230,7 @@ name = "Captain Headset Key" desc = "A spare Captain headset key, just in case The Captain ''lost'' it again." access = ACCESS_CAPTAIN - cost = 20000 + cost = 10000 contains = list(/obj/item/encryptionkey/heads/captain) crate_name = "captain headset key" crate_type = /obj/structure/closet/crate/secure/weapon @@ -2241,7 +2239,7 @@ name = "Chief Engineer Headset Key" desc = "A spare CE headset key. For when the CE throws there key into the SM again." access = ACCESS_CE - cost = 10000 + cost = 7500 contains = list(/obj/item/encryptionkey/heads/ce) crate_name = "chief engineer headset key" crate_type = /obj/structure/closet/crate/secure/weapon @@ -2250,7 +2248,7 @@ name = "Chief Medical Officer Headset Key" desc = "A spare CMO headset key, For when the CMO's headset gets stollen well they do Genetics." access = ACCESS_CMO - cost = 10000 + cost = 7500 contains = list(/obj/item/encryptionkey/heads/cmo) crate_name = "chief medical officer headset key" crate_type = /obj/structure/closet/crate/secure/weapon @@ -2348,7 +2346,7 @@ name = "Head Of Security Headset Key" desc = "A spare HOS headset key, For when the HOS's headset is being used by a Changling." access = ACCESS_HOS - cost = 10000 + cost = 7500 contains = list(/obj/item/encryptionkey/heads/hos) crate_name = "head of security headset key" crate_type = /obj/structure/closet/crate/secure/weapon @@ -2357,7 +2355,7 @@ name = "Head Of Personnel Headset Key" desc = "A spare HOP headset key, For when the HOP's headset is being used by a Traitor." access = ACCESS_HOP - cost = 10000 + cost = 7500 contains = list(/obj/item/encryptionkey/heads/hop) crate_name = "head of personnel headset key" crate_type = /obj/structure/closet/crate/secure/weapon @@ -2366,7 +2364,7 @@ name = "Med Sci Headset Keys" desc = "Three Headset Keys for ''Genetics''. To be yelled at for not cloning somone just to be yelled at for cloning them! Also get yelled at for being in sci, well having access." access = ACCESS_GENETICS - cost = 7500 + cost = 5000 contains = list( /obj/item/encryptionkey/headset_medsci, /obj/item/encryptionkey/headset_medsci, @@ -2374,17 +2372,6 @@ crate_name = "med sci headset keys" crate_type = /obj/structure/closet/crate/secure -/*Todo Add in a QM headset -/datum/supply_pack/misc/qm_headser - name = "QM, Headset Key" - desc = "A spare QM headset key, To yell at Miners and Command for things to sell." - access = ACCESS_QM - cost = 10000 - contains = list() - crate_name = "QM Headset Key" - crate_type = /obj/structure/closet/crate/secure/weapon -*/ - /datum/supply_pack/misc/religious_supplies name = "Religious Supplies Crate" desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." @@ -2398,7 +2385,7 @@ ) crate_name = "religious supplies crate" -datum/supply_pack/misc/lewd +/datum/supply_pack/misc/lewd name = "Lewd Crate" // OwO desc = "Psss want to have a good time with your sluts? Well I got what you want maid clothing, dildos, collars and more!" cost = 5000 @@ -2419,7 +2406,7 @@ datum/supply_pack/misc/lewd crate_name = "lewd kit" crate_type = /obj/structure/closet/crate -datum/supply_pack/misc/lewdkeg +/datum/supply_pack/misc/lewdkeg name = "Lewd Deluxe Keg" desc = "That other stuff not getting you ready? Well I have a Chemslut making tons of the good stuff." cost = 7000 //It can be a weapon From e3bd357a1a249eda159e49c1e1280b5e4d401832 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sat, 10 Nov 2018 00:32:46 -0500 Subject: [PATCH 07/10] Less cargo blote --- code/modules/cargo/packs.dm | 48 ++++++++++--------------------------- 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 661f951469..d356eacdc5 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2235,24 +2235,6 @@ crate_name = "captain headset key" crate_type = /obj/structure/closet/crate/secure/weapon -/datum/supply_pack/misc/ce_headset - name = "Chief Engineer Headset Key" - desc = "A spare CE headset key. For when the CE throws there key into the SM again." - access = ACCESS_CE - cost = 7500 - contains = list(/obj/item/encryptionkey/heads/ce) - crate_name = "chief engineer headset key" - crate_type = /obj/structure/closet/crate/secure/weapon - -/datum/supply_pack/misc/cmo_headset - name = "Chief Medical Officer Headset Key" - desc = "A spare CMO headset key, For when the CMO's headset gets stollen well they do Genetics." - access = ACCESS_CMO - cost = 7500 - contains = list(/obj/item/encryptionkey/heads/cmo) - crate_name = "chief medical officer headset key" - crate_type = /obj/structure/closet/crate/secure/weapon - /datum/supply_pack/misc/bicycle name = "Bicycle" desc = "Nanotrasen reminds all employees to never toy with powers outside their control." @@ -2342,24 +2324,6 @@ crate_name = "coffin" crate_type = /obj/structure/closet/crate/coffin -/datum/supply_pack/misc/hos_headset - name = "Head Of Security Headset Key" - desc = "A spare HOS headset key, For when the HOS's headset is being used by a Changling." - access = ACCESS_HOS - cost = 7500 - contains = list(/obj/item/encryptionkey/heads/hos) - crate_name = "head of security headset key" - crate_type = /obj/structure/closet/crate/secure/weapon - -/datum/supply_pack/misc/hop_headset - name = "Head Of Personnel Headset Key" - desc = "A spare HOP headset key, For when the HOP's headset is being used by a Traitor." - access = ACCESS_HOP - cost = 7500 - contains = list(/obj/item/encryptionkey/heads/hop) - crate_name = "head of personnel headset key" - crate_type = /obj/structure/closet/crate/secure/weapon - /datum/supply_pack/misc/medsci_headsets name = "Med Sci Headset Keys" desc = "Three Headset Keys for ''Genetics''. To be yelled at for not cloning somone just to be yelled at for cloning them! Also get yelled at for being in sci, well having access." @@ -2415,6 +2379,18 @@ crate_name = "deluxe keg" crate_type = /obj/structure/closet/crate +/datum/supply_pack/misc/head_keys + name = "Head Of Staft Headset Keys" + desc = "A spare set of keys for heads of staft." + access = ACCESS_CAPTAIN + cost = 15000 + contains = list(/obj/item/encryptionkey/heads/hos, + /obj/item/encryptionkey/heads/hop, + /obj/item/encryptionkey/heads/cmo, + /obj/item/encryptionkey/heads/ce) + crate_name = "Headset Keys" + crate_type = /obj/structure/closet/crate/secure/weapon + /datum/supply_pack/misc/toner name = "Toner Crate" desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'" From 508f25c14d8b0aa0145224c52f4c407e02247b0a Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 18 Nov 2018 20:19:28 -0500 Subject: [PATCH 08/10] aye --- 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 d356eacdc5..00e84265b9 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2219,7 +2219,7 @@ /datum/supply_pack/misc/captain_pen name = "Captain Pen" - desc = "A spare Captaun fountain pen." + desc = "A spare Captain fountain pen." access = ACCESS_CAPTAIN cost = 10000 contains = list(/obj/item/pen/fountain/captain) From 66b5f06514096079a402315bbed991e8c042dccc Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 20 Nov 2018 16:39:01 -0500 Subject: [PATCH 09/10] Grammar --- 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 00e84265b9..a1ddd41c64 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1552,7 +1552,7 @@ /datum/supply_pack/organic/cutlery name = "Kitchen Cutlery Deluxe Set" - desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! Form a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal." + desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal." cost = 10000 contraband = TRUE contains = list(/obj/item/sharpener, @@ -2326,7 +2326,7 @@ /datum/supply_pack/misc/medsci_headsets name = "Med Sci Headset Keys" - desc = "Three Headset Keys for ''Genetics''. To be yelled at for not cloning somone just to be yelled at for cloning them! Also get yelled at for being in sci, well having access." + desc = "Three Headset Keys for 'Genetics'. To be yelled at for not cloning someone, only to be yelled at again for cloning them! Also get yelled at for being in sci, or at least having access." access = ACCESS_GENETICS cost = 5000 contains = list( @@ -2380,8 +2380,8 @@ crate_type = /obj/structure/closet/crate /datum/supply_pack/misc/head_keys - name = "Head Of Staft Headset Keys" - desc = "A spare set of keys for heads of staft." + name = "Head Of Staff Headset Keys" + desc = "A spare set of keys for heads of staff." access = ACCESS_CAPTAIN cost = 15000 contains = list(/obj/item/encryptionkey/heads/hos, From 810f7f186d97f60f167ee9a29f3b0d9d9008cd67 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 20 Nov 2018 19:37:13 -0500 Subject: [PATCH 10/10] Headset sorrow --- code/modules/cargo/packs.dm | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index a1ddd41c64..6ad00a47ea 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -2226,15 +2226,6 @@ crate_name = "captain pen" crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen -/datum/supply_pack/misc/captain_headset - name = "Captain Headset Key" - desc = "A spare Captain headset key, just in case The Captain ''lost'' it again." - access = ACCESS_CAPTAIN - cost = 10000 - contains = list(/obj/item/encryptionkey/heads/captain) - crate_name = "captain headset key" - crate_type = /obj/structure/closet/crate/secure/weapon - /datum/supply_pack/misc/bicycle name = "Bicycle" desc = "Nanotrasen reminds all employees to never toy with powers outside their control." @@ -2324,18 +2315,6 @@ crate_name = "coffin" crate_type = /obj/structure/closet/crate/coffin -/datum/supply_pack/misc/medsci_headsets - name = "Med Sci Headset Keys" - desc = "Three Headset Keys for 'Genetics'. To be yelled at for not cloning someone, only to be yelled at again for cloning them! Also get yelled at for being in sci, or at least having access." - access = ACCESS_GENETICS - cost = 5000 - contains = list( - /obj/item/encryptionkey/headset_medsci, - /obj/item/encryptionkey/headset_medsci, - /obj/item/encryptionkey/headset_medsci) - crate_name = "med sci headset keys" - crate_type = /obj/structure/closet/crate/secure - /datum/supply_pack/misc/religious_supplies name = "Religious Supplies Crate" desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." @@ -2379,18 +2358,6 @@ crate_name = "deluxe keg" crate_type = /obj/structure/closet/crate -/datum/supply_pack/misc/head_keys - name = "Head Of Staff Headset Keys" - desc = "A spare set of keys for heads of staff." - access = ACCESS_CAPTAIN - cost = 15000 - contains = list(/obj/item/encryptionkey/heads/hos, - /obj/item/encryptionkey/heads/hop, - /obj/item/encryptionkey/heads/cmo, - /obj/item/encryptionkey/heads/ce) - crate_name = "Headset Keys" - crate_type = /obj/structure/closet/crate/secure/weapon - /datum/supply_pack/misc/toner name = "Toner Crate" desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'"