From fa018861e8ca8bca1c32c560f35d64d8a0a8fcd5 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Wed, 27 Apr 2016 16:20:06 +0100 Subject: [PATCH] New cargo crates to buy Also some minor spelling fixes I noticed. :cl: coiax tweak: Internals Crate now contains breath masks and small tanks. rscadd: Metal foam grenade box crate added for 1000 points rscadd: Added two Engineering Mesons to Engineering Gear Crate tweak: Engineering Gear now costs 1300 rscadd: Breach Shield Generator Crate added for 2500 points rscadd: Grounding Rod Crate added for 2500 points rscadd: PACMAN Generator Crate added for 2500 rscadd: Defibrillator Crate added for 1500 rscadd: Nanotrasen Customs report that some wide band suppliers have been providing "alternative" firing pins. Nanotrasen reminds all crewmembers that contraband is contraband. /:cl: Laser tag firing pins (only allow gun to be fired with laser tag armor of the appropriate colour) added to contraband. Special clown firing pin (prank your friends) added to contraband. --- .../objects/items/weapons/storage/boxes.dm | 13 +++- code/modules/cargo/export_scanner.dm | 4 +- code/modules/cargo/packs.dm | 69 +++++++++++++++++-- 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index bb95dbf2d7f..23c8c3f64c3 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -381,6 +381,17 @@ for(var/i in 1 to 5) new /obj/item/device/firing_pin(src) +/obj/item/weapon/storage/box/lasertagpins + name = "box of laser tag firing pins" + desc = "A box full of laser tag firing pins, to allow newly-developed firearms to require wearing brightly coloured plastic armor before being able to be used." + icon_state = "id" + +/obj/item/weapon/storage/box/lasertagpins/New() + ..() + for(var/i in 1 to 3) + new /obj/item/device/firing_pin/tag/red(src) + new /obj/item/device/firing_pin/tag/blue(src) + /obj/item/weapon/storage/box/handcuffs name = "box of spare handcuffs" desc = "A box full of handcuffs." @@ -795,4 +806,4 @@ new /obj/item/weapon/circuitboard/protolathe(src) new /obj/item/weapon/circuitboard/destructive_analyzer(src) new /obj/item/weapon/circuitboard/circuit_imprinter(src) - new /obj/item/weapon/circuitboard/rdconsole(src) \ No newline at end of file + new /obj/item/weapon/circuitboard/rdconsole(src) diff --git a/code/modules/cargo/export_scanner.dm b/code/modules/cargo/export_scanner.dm index 7d085ff97f5..e17e7b5f635 100644 --- a/code/modules/cargo/export_scanner.dm +++ b/code/modules/cargo/export_scanner.dm @@ -11,7 +11,7 @@ /obj/item/device/export_scanner/examine(user) ..() if(!cargo_console) - user << "You had to link it to supply console for it to work." + user << "The [src] is currently not linked to a cargo console." /obj/item/device/export_scanner/afterattack(obj/O, mob/user, proximity) if(!istype(O) || !proximity) @@ -44,4 +44,4 @@ exported = TRUE break if(!exported) - user << "The object is unexportable." \ No newline at end of file + user << "The object is unexportable." diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 8fcbcff8bcc..a76603a1d50 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -53,6 +53,12 @@ contains = list(/obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, + /obj/item/clothing/mask/breath, + /obj/item/clothing/mask/breath, + /obj/item/clothing/mask/breath, + /obj/item/weapon/tank/internals/emergency_oxygen, + /obj/item/weapon/tank/internals/emergency_oxygen, + /obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/weapon/tank/internals/air, /obj/item/weapon/tank/internals/air, /obj/item/weapon/tank/internals/air) @@ -105,6 +111,12 @@ crate_name = "weed control crate" crate_type = /obj/structure/closet/crate/secure/hydroponics +/datum/supply_pack/emergency/metalfoam + name = "Metal Foam Grenade Crate" + cost = 1000 + contains = list(/obj/item/weapon/storage/box/metalfoam,) + crate_name = "metal foam grenade crate" + /datum/supply_pack/emergency/specialops name = "Special Ops Supplies" hidden = TRUE @@ -440,7 +452,7 @@ /datum/supply_pack/engineering/engiequipment name = "Engineering Gear Crate" - cost = 1000 + cost = 1300 contains = list(/obj/item/weapon/storage/belt/utility, /obj/item/weapon/storage/belt/utility, /obj/item/weapon/storage/belt/utility, @@ -452,7 +464,9 @@ /obj/item/clothing/head/welding, /obj/item/clothing/head/hardhat, /obj/item/clothing/head/hardhat, - /obj/item/clothing/head/hardhat) + /obj/item/clothing/head/hardhat, + /obj/item/clothing/glasses/meson/engine, + /obj/item/clothing/glasses/meson/engine,) crate_name = "engineering gear crate" /datum/supply_pack/engineering/engine/spacesuit @@ -468,6 +482,30 @@ crate_name = "space suit crate" crate_type = /obj/structure/closet/crate/secure +/datum/supply_pack/engineering/shieldgen + name = "Anti-breach Shield Projector Crate" + cost = 2500 + contains = list(/obj/machinery/shieldgen, + /obj/machinery/shieldgen,) + crate_name = "anti-breach shield projector crate" + +/datum/supply_pack/engineering/grounding_rods + name = "Grounding Rod Crate" + cost = 2500 + contains = list(/obj/machinery/power/grounding_rod, + /obj/machinery/power/grounding_rod, + /obj/machinery/power/grounding_rod, + /obj/machinery/power/grounding_rod) + crate_name = "grounding rod crate" + crate_type = /obj/structure/closet/crate/engineering/electrical + +/datum/supply_pack/engineering/pacman + name = "P.A.C.M.A.N Generator Crate" + cost = 2500 + contains = list(/obj/machinery/power/port_gen/pacman,) + crate_name = "PACMAN generator crate" + crate_type = /obj/structure/closet/crate/engineering/electrical + /datum/supply_pack/engineering/solar name = "Solar Panel Crate" cost = 2000 @@ -668,6 +706,13 @@ contains = list(/obj/machinery/iv_drip) crate_name = "iv drip crate" +/datum/supply_pack/medical/defibs + name = "Defibrillator Crate" + cost = 1500 + contains = list(/obj/item/weapon/defibrillator/loaded, + /obj/item/weapon/defibrillator/loaded,) + crate_name = "defibrillator crate" + ////////////////////////////////////////////////////////////////////////////// //////////////////////////// Science ///////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////// @@ -938,7 +983,7 @@ crate_name = "exotic seeds crate" /datum/supply_pack/organic/hydroponics/beekeeping_fullkit - name = "Beekeeping Starter Kit" + name = "Beekeeping Starter Crate" cost = 1500 contains = list(/obj/structure/beebox, /obj/item/honey_frame, @@ -947,10 +992,10 @@ /obj/item/queen_bee/bought, /obj/item/clothing/head/beekeeper_head, /obj/item/clothing/suit/beekeeper_suit) - crate_name = "beekeeping starter kit" + crate_name = "beekeeping starter crate" /datum/supply_pack/organic/hydroponics/beekeeping_suits - name = "2 Beekeeper suits" + name = "Beekeeper Suit Crate" cost = 1000 contains = list(/obj/item/clothing/head/beekeeper_head, /obj/item/clothing/suit/beekeeper_suit, @@ -1095,6 +1140,20 @@ /obj/item/clothing/head/helmet/bluetaghelm) crate_name = "laser tag crate" +/datum/supply_pack/misc/lasertag/pins + name = "Laser Tag Firing Pins Crate" + cost = 2000 + contraband = TRUE + contains = list(/obj/item/weapon/storage/box/lasertagpins,) + crate_name = "laser tag firing pins crate" + +/datum/supply_pack/misc/clownpin + name = "Hilarious Firing Pin Crate" + cost = 5000 + contraband = TRUE + contains = list(/obj/item/device/firing_pin/clown,) + crate_name = "hilarious firing pin crate" + /datum/supply_pack/misc/religious_supplies name = "Religious Supplies Crate" cost = 4000 // it costs so much because the Space Church is ran by Space Jews