Conflicts galore

code/modules/cargo/bounties/medical.dm

@@ -121,7 +121,7 @@
 
 /datum/bounty/item/medical/defibrillator
 	name = "New defibillators"
-	description = "After years of storge our defib units have become liabilities. Please send us some new ones."
+	description = "After years of storage our defibrillation units have worn out. Please send us some new ones."
 	reward = 2250
 	required_count = 5
 	wanted_types = list(/obj/item/defibrillator)

code/modules/cargo/console.dm

@@ -119,6 +119,7 @@
 	var/list/data = list()
 	data["requestonly"] = requestonly
 	data["supplies"] = list()
+	data["emagged"] = obj_flags & EMAGGED
 	for(var/pack in SSshuttle.supply_packs)
 		var/datum/supply_pack/P = SSshuttle.supply_packs[pack]
 		if(!data["supplies"][P.group])
@@ -133,7 +134,8 @@
 			"cost" = P.cost,
 			"id" = pack,
 			"desc" = P.desc || P.name, // If there is a description, use it. Otherwise use the pack's name.
-			"access" = P.access
+			"access" = P.access,
+			"can_private_buy" = P.can_private_buy
 		))
 	return data
 
@@ -195,9 +197,10 @@
 				rank = "Silicon"
 
 			var/datum/bank_account/account
-			if(self_paid && ishuman(usr))
-				var/mob/living/carbon/human/H = usr
-				var/obj/item/card/id/id_card = H.get_idcard(TRUE)
+			if(self_paid)
+				if(!pack.can_private_buy && !(obj_flags & EMAGGED))
+					return
+				var/obj/item/card/id/id_card = usr.get_idcard(TRUE)
 				if(!istype(id_card))
 					say("No ID card detected.")
 					return

code/modules/cargo/exports.dm

@@ -68,7 +68,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
 	var/unit_name = ""				// Unit name. Only used in "Received [total_amount] [name]s [message]." message
 	var/message = ""
 	var/cost = 100					// Cost of item, in cargo credits. Must not alow for infinite price dupes, see above.
-	var/k_elasticity = 1/300			//coefficient used in marginal price calculation that roughly corresponds to the inverse of price elasticity, or "quantity elasticity" - CIT EDIT 1/30 - > 0
+	var/k_elasticity = 1/100			//coefficient used in marginal price calculation that roughly corresponds to the inverse of price elasticity, or "quantity elasticity" - CIT EDIT 1/30 - > 100
 	var/list/export_types = list()	// Type of the exported object. If none, the export datum is considered base type.
 	var/include_subtypes = TRUE		// Set to FALSE to make the datum apply only to a strict type.
 	var/list/exclude_types = list()	// Types excluded from export

code/modules/cargo/exports/gear.dm

@@ -1,5 +1,6 @@
 /datum/export/gear
 	include_subtypes = FALSE
+	k_elasticity = 0 //We always want clothing/gear
 
 //blanket
 /datum/export/gear/hat

code/modules/cargo/exports/large_objects.dm

@@ -111,7 +111,7 @@
 	include_subtypes = FALSE
 
 /datum/export/large/am_control_unit
-	cost = 4000
+	cost = 2000
 	unit_name = "antimatter control unit"
 	export_types = list(/obj/machinery/power/am_control_unit)
 

code/modules/cargo/exports/organs_robotics.dm

@@ -2,15 +2,14 @@
 
 /datum/export/robotics
 	include_subtypes = FALSE
-	k_elasticity = 0 //ALWAYS worth selling upgrades
+	k_elasticity = 1/50
 
 /datum/export/implant
 	include_subtypes = FALSE
-	k_elasticity = 0 //ALWAYS worth selling upgrades
+	k_elasticity = 1/50
 
 /datum/export/organs
 	include_subtypes = TRUE
-	k_elasticity = 0 //ALWAYS worth selling orgains
 
 /datum/export/implant/autodoc
 	cost = 150
@@ -60,11 +59,6 @@
 	unit_name = "thrusters set implant"
 	export_types = list(/obj/item/organ/cyberimp/chest/thrusters)
 
-/datum/export/implant/thrusters
-	cost = 150
-	unit_name = "thrusters set implant"
-	export_types = list(/obj/item/organ/cyberimp/chest/thrusters)
-
 /datum/export/implant/arm
 	cost = 200
 	unit_name = "arm set implant"

code/modules/cargo/exports/parts.dm

@@ -110,7 +110,7 @@
 	include_subtypes = FALSE
 
 /datum/export/glasswork_lens
-	cost = 1800
+	cost = 1600
 	unit_name = "small glass lens"
 	export_types = list(/obj/item/glasswork/glass_base/lens)
 
@@ -133,13 +133,13 @@
 	include_subtypes = FALSE
 
 /datum/export/glasswork_teaplate
-	cost = 1200
+	cost = 1000
 	unit_name = "tea gear"
 	export_types = list(/obj/item/tea_plate)
 	include_subtypes = FALSE
 
 /datum/export/glasswork_teacup
-	cost = 1800
+	cost = 1600
 	unit_name = "tea gear"
 	export_types = list(/obj/item/tea_cup)
 	include_subtypes = FALSE

code/modules/cargo/exports/sheets.dm

@@ -120,12 +120,6 @@
 	message = "of cloth"
 	export_types = list(/obj/item/stack/sheet/cloth)
 
-/datum/export/stack/silk
-	cost = 200 //The new plasma
-	unit_name = "sheets"
-	message = "of silk"
-	export_types = list(/obj/item/stack/sheet/silk)
-
 /datum/export/stack/duracloth
 	cost = 40
 	unit_name = "sheets"

code/modules/cargo/exports/tools.dm

@@ -1,4 +1,7 @@
-/datum/export/toolbox
+/datum/export/tool
+	k_elasticity = 1/500 //Tool selling almost allways fine a target
+
+/datum/export/tool/toolbox
 	cost = 6
 	unit_name = "toolbox"
 	export_types = list(/obj/item/storage/toolbox)
@@ -29,93 +32,93 @@
 
 // Lights/Eletronic
 
-/datum/export/lights
+/datum/export/tool/lights
 	cost = 10
 	unit_name = "light fixer"
 	export_types = list(/obj/item/wallframe/light_fixture)
 	include_subtypes = TRUE
 
-/datum/export/apc_board
+/datum/export/tool/apc_board
 	cost = 5
 	unit_name = "apc electronics"
 	export_types = list(/obj/item/electronics/apc)
 	include_subtypes = TRUE
 
-/datum/export/apc_frame
+/datum/export/tool/apc_frame
 	cost = 3
 	unit_name = "apc frame"
 	export_types = list(/obj/item/wallframe/apc)
 	include_subtypes = TRUE
 
-/datum/export/floodlights
+/datum/export/tool/floodlights
 	cost = 15
 	unit_name = "floodlight fixer"
 	export_types = list(/obj/structure/floodlight_frame)
 	include_subtypes = TRUE
 
-/datum/export/bolbstubes
+/datum/export/tool/bolbstubes
 	cost = 1 //Time
 	unit_name = "light replacement"
 	export_types = list(/obj/item/light/tube, /obj/item/light/bulb)
 
-/datum/export/lightreplacer
+/datum/export/tool/lightreplacer
 	cost = 20
 	unit_name = "lightreplacer"
 	export_types = list(/obj/item/lightreplacer)
 
 // Basic tools
-/datum/export/basicmining
+/datum/export/tool/basicmining
 	cost = 30
 	unit_name = "basic mining tool"
 	export_types = list(/obj/item/pickaxe, /obj/item/pickaxe/mini, /obj/item/shovel, /obj/item/resonator)
 	include_subtypes = FALSE
 
-/datum/export/upgradedmining
+/datum/export/tool/upgradedmining
 	cost = 80
 	unit_name = "mining tool"
 	export_types = list(/obj/item/pickaxe/silver, /obj/item/pickaxe/drill, /obj/item/gun/energy/plasmacutter, /obj/item/resonator/upgraded)
 	include_subtypes = FALSE
 
-/datum/export/advdmining
+/datum/export/tool/advdmining
 	cost = 150
 	unit_name = "advanced mining tool"
 	export_types = list(/obj/item/pickaxe/diamond, /obj/item/pickaxe/drill/diamonddrill, /obj/item/pickaxe/drill/jackhammer, /obj/item/gun/energy/plasmacutter/adv)
 	include_subtypes = FALSE
 
-/datum/export/screwdriver
+/datum/export/tool/screwdriver
 	cost = 2
 	unit_name = "screwdriver"
 	export_types = list(/obj/item/screwdriver)
 	include_subtypes = FALSE
 
-/datum/export/wrench
+/datum/export/tool/wrench
 	cost = 2
 	unit_name = "wrench"
 	export_types = list(/obj/item/wrench)
 
-/datum/export/crowbar
+/datum/export/tool/crowbar
 	cost = 2
 	unit_name = "crowbar"
 	export_types = list(/obj/item/crowbar)
 
-/datum/export/wirecutters
+/datum/export/tool/wirecutters
 	cost = 2
 	unit_name = "pair"
 	message = "of wirecutters"
 	export_types = list(/obj/item/wirecutters)
 
-/datum/export/weldingtool
+/datum/export/tool/weldingtool
 	cost = 5
 	unit_name = "welding tool"
 	export_types = list(/obj/item/weldingtool)
 	include_subtypes = FALSE
 
-/datum/export/weldingtool/emergency
+/datum/export/tool/weldingtool/emergency
 	cost = 2
 	unit_name = "emergency welding tool"
 	export_types = list(/obj/item/weldingtool/mini)
 
-/datum/export/weldingtool/industrial
+/datum/export/tool/weldingtool/industrial
 	cost = 10
 	unit_name = "industrial welding tool"
 	export_types = list(/obj/item/weldingtool/largetank, /obj/item/weldingtool/hugetank)
@@ -131,23 +134,23 @@
 	unit_name = "pocket fire extinguisher"
 	export_types = list(/obj/item/extinguisher/mini)
 
-/datum/export/flashlight
+/datum/export/tool/flashlight
 	cost = 3
 	unit_name = "flashlight"
 	export_types = list(/obj/item/flashlight)
 	include_subtypes = FALSE
 
-/datum/export/flashlight/flare
+/datum/export/tool/flashlight/flare
 	cost = 2
 	unit_name = "flare"
 	export_types = list(/obj/item/flashlight/flare)
 
-/datum/export/flashlight/seclite
+/datum/export/tool/flashlight/seclite
 	cost = 5
 	unit_name = "seclite"
 	export_types = list(/obj/item/flashlight/seclite)
 
-/datum/export/analyzer
+/datum/export/tool/analyzer
 	cost = 5
 	unit_name = "analyzer"
 	export_types = list(/obj/item/analyzer)
@@ -163,32 +166,32 @@
 	export_types = list(/obj/item/radio)
 	exclude_types = list(/obj/item/radio/mech)
 
-/datum/export/rcd
+/datum/export/tool/rcd
 	cost = 100
 	unit_name = "rapid construction device"
 	export_types = list(/obj/item/construction/rcd)
 
-/datum/export/rcd_ammo
+/datum/export/tool/rcd_ammo
 	cost = 60
 	unit_name = "compressed matter cardridge"
 	export_types = list(/obj/item/rcd_ammo)
 
-/datum/export/rpd
+/datum/export/tool/rpd
 	cost = 100
 	unit_name = "rapid piping device"
 	export_types = list(/obj/item/pipe_dispenser)
 
-/datum/export/rld
+/datum/export/tool/rld
 	cost = 150
 	unit_name = "rapid light device"
 	export_types = list(/obj/item/construction/rld)
 
-/datum/export/rped
+/datum/export/tool/rped
 	cost = 100
 	unit_name = "rapid part exchange device"
 	export_types = list(/obj/item/storage/part_replacer)
 
-/datum/export/bsrped
+/datum/export/tool/bsrped
 	cost = 200
 	unit_name = "blue space part exchange device"
 	export_types = list(/obj/item/storage/part_replacer/bluespace)

code/modules/cargo/gondolapod.dm

@@ -2,9 +2,12 @@
 	name = "gondola"
 	real_name = "gondola"
 	desc = "The silent walker. This one seems to be part of a delivery agency."
-	response_help = "pets"
-	response_disarm = "bops"
-	response_harm = "kicks"
+	response_help_continuous = "pets"
+	response_help_simple = "pet"
+	response_disarm_continuous = "bops"
+	response_disarm_simple = "bop"
+	response_harm_continuous = "kicks"
+	response_harm_simple = "kick"
 	faction = list("gondola")
 	turns_per_move = 10
 	icon = 'icons/mob/gondolapod.dmi'

code/modules/cargo/packs.dm

@@ -15,6 +15,7 @@
 	var/special_enabled = FALSE
 	var/DropPodOnly = FALSE //only usable by the Bluespace Drop Pod via the express cargo console
 	var/admin_spawned = FALSE //Can only an admin spawn this crate?
+	var/can_private_buy = TRUE //Can it be purchased privately by each crewmember?
 
 /datum/supply_pack/proc/generate(atom/A, datum/bank_account/paying_account)
 	var/obj/structure/closet/crate/C

code/modules/cargo/packs/armory.dm

@@ -10,6 +10,7 @@
 	group = "Armory"
 	access = ACCESS_ARMORY
 	crate_type = /obj/structure/closet/crate/secure/weapon
+	can_private_buy = FALSE
 
 /datum/supply_pack/security/armory/bulletarmor
 	name = "Bulletproof Armor Crate"
@@ -214,7 +215,7 @@
 
 /datum/supply_pack/security/armory/wt550ammo
 	name = "WT-550 Semi-Auto SMG Ammo Crate"
-	desc = "Contains four 20-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
+	desc = "Contains four 32-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
 	cost = 1750
 	contains = list(/obj/item/ammo_box/magazine/wt550m9,
 					/obj/item/ammo_box/magazine/wt550m9,
@@ -224,7 +225,7 @@
 
 /datum/supply_pack/security/armory/wt550ammo_nonlethal // Takes around 12 shots to stamcrit someone
 	name = "WT-550 Semi-Auto SMG Non-Lethal Ammo Crate"
-	desc = "Contains four 20-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
+	desc = "Contains four 32-round magazines for the WT-550 Semi-Auto SMG. Each magazine is designed to facilitate rapid tactical reloads. Requires Armory access to open."
 	cost = 1000
 	contains = list(/obj/item/ammo_box/magazine/wt550m9/wtrubber,
 					/obj/item/ammo_box/magazine/wt550m9/wtrubber,

code/modules/cargo/packs/engine.dm

@@ -148,7 +148,7 @@
 	crate_name = "supermatter shard crate"
 	crate_type = /obj/structure/closet/crate/secure/engineering
 	dangerous = TRUE
-	
+
 /datum/supply_pack/engine/tesla_coils
 	name = "Tesla Coil Crate"
 	desc = "Whether it's high-voltage executions, creating research points, or just plain old power generation: This pack of four Tesla coils can do it all!"

code/modules/cargo/packs/materials.dm

@@ -81,32 +81,6 @@
 	contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
 	crate_name = "wood planks crate"
 
-/datum/supply_pack/materials/rawcotton
-	name = "Raw Cotton Crate"
-	desc = "Plushies have been on the down in the market, and now due to a flood of raw cotton the price of it is so cheap, its a steal! Contains 40 raw cotton sheets."
-	cost = 800 // 100 net cost, 20 x 20 = 400. 300 profit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000
-	contains = list(/obj/item/stack/sheet/cotton/thirty,
-					/obj/item/stack/sheet/cotton/ten
-					)
-	crate_name = "cotton crate"
-	crate_type = /obj/structure/closet/crate/hydroponics
-
-/datum/supply_pack/materials/rawcottonbulk
-	name = "Raw Cotton Crate (Bulk)"
-	desc = "We have so much of this stuff we need to get rid of it in -bulk- now. This crate contains 240 raw cotton sheets."
-	cost = 1300 // 600 net cost 20 x 120 = 2400 profit if turned into cloth sheets or if turned into silk 200 x 60 = 12000
-	contains = list(/obj/item/stack/sheet/cotton/thirty,
-					/obj/item/stack/sheet/cotton/thirty,
-					/obj/item/stack/sheet/cotton/thirty,
-					/obj/item/stack/sheet/cotton/thirty,
-					/obj/item/stack/sheet/cotton/thirty,
-					/obj/item/stack/sheet/cotton/thirty,
-					/obj/item/stack/sheet/cotton/thirty,
-					/obj/item/stack/sheet/cotton/thirty,
-					)
-	crate_name = "bulk cotton crate"
-	crate_type = /obj/structure/closet/crate/hydroponics
-
 /datum/supply_pack/materials/rcdammo
 	name = "Spare RCD ammo"
 	desc = "This crate contains sixteen RCD compressed matter packs, to help with any holes or projects people might be working on."

code/modules/cargo/packs/medical.dm

@@ -252,6 +252,7 @@
 	crate_name = "virus crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma
 	dangerous = TRUE
+	can_private_buy = FALSE
 
 /datum/supply_pack/medical/anitvirus
 	name = "Virus Containment Crate"
@@ -271,4 +272,4 @@
 					/obj/item/storage/box/syringes,
 					/obj/item/storage/box/beakers)
 	crate_name = "virus containment unit crate"
-	crate_type = /obj/structure/closet/crate/secure/plasma
+	crate_type = /obj/structure/closet/crate/secure/plasma

code/modules/cargo/packs/organic.dm

@@ -370,22 +370,6 @@
 /////////////////////////////////// Misc /////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
-/datum/supply_pack/organic/hunting
-	name = "Hunting Gear"
-	desc = "Even in space, we can find prey to hunt, this crate contains everthing a fine hunter needs to have a sporting time. This crate needs armory access to open. A true huntter only needs a fine bottle of cognac, a nice coat, some good o' cigars, and of cource a hunting shotgun. "
-	cost = 3500
-	contraband = TRUE
-	contains = list(/obj/item/clothing/head/flatcap,
-					/obj/item/clothing/suit/hooded/wintercoat/captain,
-					/obj/item/reagent_containers/food/drinks/bottle/cognac,
-					/obj/item/storage/fancy/cigarettes/cigars/havana,
-					/obj/item/clothing/gloves/color/white,
-					/obj/item/clothing/under/rank/civilian/curator,
-					/obj/item/gun/ballistic/shotgun/lethal)
-	access = ACCESS_ARMORY
-	crate_name = "sporting crate"
-	crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:(
-
 /datum/supply_pack/organic/party
 	name = "Party Equipment"
 	desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, a drinking shaker, and a bottle of patron & goldschlager!"

code/modules/cargo/packs/science.dm

@@ -17,6 +17,7 @@
 	cost = 2500
 	contains = list (/obj/item/reagent_containers/food/snacks/cube/ape)
 	crate_name = "ape cube crate"
+	can_private_buy = FALSE
 
 /datum/supply_pack/science/beakers
 	name = "Chemistry Beakers Crate"

code/modules/cargo/packs/security.dm

@@ -10,6 +10,7 @@
 	group = "Security"
 	access = ACCESS_SECURITY
 	crate_type = /obj/structure/closet/crate/secure/gear
+	can_private_buy = FALSE
 
 /datum/supply_pack/security/ammo
 	name = "Ammo Crate - General Purpose"
@@ -57,6 +58,7 @@
 					/obj/item/toy/crayon/white,
 					/obj/item/clothing/head/fedora/det_hat)
 	crate_name = "forensics crate"
+	can_private_buy = TRUE
 
 /datum/supply_pack/security/helmets
 	name = "Helmets Crate"
@@ -134,6 +136,7 @@
 					/obj/item/grenade/barrier)
 	cost = 2000
 	crate_name = "security barriers crate"
+	can_private_buy = TRUE
 
 /datum/supply_pack/security/securityclothes
 	name = "Security Clothing Crate"
@@ -152,6 +155,7 @@
 					/obj/item/clothing/suit/armor/hos/navyblue,
 					/obj/item/clothing/head/beret/sec/navyhos)
 	crate_name = "security clothing crate"
+	can_private_buy = TRUE
 
 /datum/supply_pack/security/supplies
 	name = "Security Supplies Crate"
@@ -179,6 +183,7 @@
 	contains = list(/obj/item/clothing/head/helmet/justice,
 					/obj/item/clothing/mask/gas/sechailer)
 	crate_name = "security clothing crate"
+	can_private_buy = TRUE
 
 /datum/supply_pack/security/baton
 	name = "Stun Batons Crate"
@@ -207,3 +212,19 @@
 					/obj/item/storage/box/wall_flash,
 					/obj/item/storage/box/wall_flash)
 	crate_name = "wall-mounted flash crate"
+
+/datum/supply_pack/security/hunting
+	name = "Hunting Gear"
+	desc = "Even in space, we can find prey to hunt, this crate contains everthing a fine hunter needs to have a sporting time. This crate needs armory access to open. A true huntter only needs a fine bottle of cognac, a nice coat, some good o' cigars, and of cource a hunting shotgun. "
+	cost = 3500
+	contraband = TRUE
+	contains = list(/obj/item/clothing/head/flatcap,
+					/obj/item/clothing/suit/hooded/wintercoat/captain,
+					/obj/item/reagent_containers/food/drinks/bottle/cognac,
+					/obj/item/storage/fancy/cigarettes/cigars/havana,
+					/obj/item/clothing/gloves/color/white,
+					/obj/item/clothing/under/rank/civilian/curator,
+					/obj/item/gun/ballistic/shotgun/lethal)
+	access = ACCESS_ARMORY
+	crate_name = "sporting crate"
+	crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:(

code/modules/cargo/packs/vending.dm

@@ -99,6 +99,7 @@
 	contains = list(/obj/machinery/vending/security)
 	crate_name = "SecTech supply crate"
 	crate_type = /obj/structure/closet/crate/secure/gear
+	can_private_buy = FALSE
 
 /datum/supply_pack/vending/snack
 	name = "Snack Supply Crate"