Merge branch 'master' into mortar-throw-limit

code/__DEFINES/job.dm

@@ -12,6 +12,7 @@
 #define SQUAD_MARINE_INTEL "Intel"
 #define SQUAD_SOF "SOF"
 #define SQUAD_CBRN "CBRN"
+#define SQUAD_FORECON "FORECON"
 
 // Job name defines
 #define JOB_SQUAD_MARINE "Rifleman"

code/__pragmas.dm

@@ -21,6 +21,7 @@
 #pragma InvalidOverride error
 #pragma DanglingVarType error
 #pragma MissingInterpolatedExpression error
+#pragma InvalidIndexOperation error
 
 //3000-3999
 #pragma EmptyBlock error

code/_globalvars/global_lists.dm

@@ -119,6 +119,34 @@ GLOBAL_LIST(chemical_reactions_filtered_list) //List of all /datum/chemical_reac
 GLOBAL_LIST(chemical_reactions_list) //List of all /datum/chemical_reaction datums indexed by reaction id. Used to search for the result instead of the components.
 GLOBAL_LIST(chemical_reagents_list) //List of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff
 GLOBAL_LIST(chemical_properties_list) //List of all /datum/chem_property datums indexed by property name
+//list of all properties that conflict with each other.
+GLOBAL_LIST_INIT_TYPED(conflicting_properties, /list, list( PROPERTY_NUTRITIOUS = PROPERTY_HEMORRAGING, PROPERTY_NUTRITIOUS = PROPERTY_HEMOLYTIC, PROPERTY_TOXIC = PROPERTY_ANTITOXIC,\
+											PROPERTY_CORROSIVE = PROPERTY_ANTICORROSIVE, PROPERTY_BIOCIDIC = PROPERTY_NEOGENETIC, PROPERTY_HYPERTHERMIC = PROPERTY_HYPOTHERMIC,\
+											PROPERTY_NUTRITIOUS = PROPERTY_KETOGENIC, PROPERTY_PAINING = PROPERTY_PAINKILLING, PROPERTY_HALLUCINOGENIC = PROPERTY_ANTIHALLUCINOGENIC,\
+											PROPERTY_HEPATOTOXIC = PROPERTY_HEPATOPEUTIC, PROPERTY_NEPHROTOXIC = PROPERTY_NEPHROPEUTIC, PROPERTY_PNEUMOTOXIC = PROPERTY_PNEUMOPEUTIC,\
+											PROPERTY_OCULOTOXIC = PROPERTY_OCULOPEUTIC, PROPERTY_CARDIOTOXIC = PROPERTY_CARDIOPEUTIC, PROPERTY_NEUROTOXIC = PROPERTY_NEUROPEUTIC,\
+											PROPERTY_FLUXING = PROPERTY_REPAIRING, PROPERTY_RELAXING = PROPERTY_MUSCLESTIMULATING, PROPERTY_HEMOGENIC = PROPERTY_HEMOLYTIC,\
+											PROPERTY_HEMOGENIC = PROPERTY_HEMORRAGING, PROPERTY_NUTRITIOUS = PROPERTY_EMETIC,\
+											PROPERTY_HYPERGENETIC = PROPERTY_NEOGENETIC, PROPERTY_HYPERGENETIC = PROPERTY_HEPATOPEUTIC, PROPERTY_HYPERGENETIC = PROPERTY_NEPHROPEUTIC,\
+											PROPERTY_HYPERGENETIC = PROPERTY_PNEUMOPEUTIC, PROPERTY_HYPERGENETIC = PROPERTY_OCULOPEUTIC, PROPERTY_HYPERGENETIC = PROPERTY_CARDIOPEUTIC,\
+											PROPERTY_HYPERGENETIC = PROPERTY_NEUROPEUTIC, PROPERTY_ADDICTIVE = PROPERTY_ANTIADDICTIVE, PROPERTY_NEUROSHIELDING = PROPERTY_NEUROTOXIC,\
+											PROPERTY_HYPOMETABOLIC = PROPERTY_HYPERMETABOLIC, PROPERTY_HYPERTHROTTLING = PROPERTY_NEUROINHIBITING,
+											PROPERTY_FOCUSING = PROPERTY_NERVESTIMULATING, PROPERTY_THERMOSTABILIZING = PROPERTY_HYPERTHERMIC, PROPERTY_THERMOSTABILIZING = PROPERTY_HYPOTHERMIC,
+											PROPERTY_AIDING = PROPERTY_NEUROINHIBITING, PROPERTY_OXYGENATING = PROPERTY_HYPOXEMIC, PROPERTY_ANTICARCINOGENIC = PROPERTY_CARCINOGENIC, \
+											PROPERTY_CIPHERING = PROPERTY_CIPHERING_PREDATOR, PROPERTY_TRANSFORMATIVE = PROPERTY_ANTITOXIC, PROPERTY_MUSCLESTIMULATING = PROPERTY_NERVESTIMULATING))
+//list of all properties that combine into something else, now featured in global list
+GLOBAL_LIST_INIT_TYPED(combining_properties, /list, list( PROPERTY_DEFIBRILLATING = list(PROPERTY_MUSCLESTIMULATING, PROPERTY_CARDIOPEUTIC),\
+											PROPERTY_THANATOMETABOL = list(PROPERTY_HYPOXEMIC, PROPERTY_CRYOMETABOLIZING, PROPERTY_NEUROCRYOGENIC),\
+											PROPERTY_HYPERDENSIFICATING = list(PROPERTY_MUSCLESTIMULATING, PROPERTY_BONEMENDING, PROPERTY_CARCINOGENIC),\
+											PROPERTY_HYPERTHROTTLING = list(PROPERTY_PSYCHOSTIMULATING, PROPERTY_HALLUCINOGENIC),\
+											PROPERTY_NEUROSHIELDING = list(PROPERTY_ALCOHOLIC, PROPERTY_BALDING),\
+											PROPERTY_ANTIADDICTIVE = list(PROPERTY_PSYCHOSTIMULATING, PROPERTY_ANTIHALLUCINOGENIC),\
+											PROPERTY_ADDICTIVE = list(PROPERTY_PSYCHOSTIMULATING, PROPERTY_NEUROTOXIC),\
+											PROPERTY_CIPHERING_PREDATOR = list(PROPERTY_CIPHERING, PROPERTY_CROSSMETABOLIZING),\
+											PROPERTY_FIRE_PENETRATING = list(PROPERTY_OXYGENATING, PROPERTY_VISCOUS),\
+											PROPERTY_BONEMENDING = list(PROPERTY_HYPERDENSIFICATING, PROPERTY_NUTRITIOUS),\
+											PROPERTY_BONEMENDING = list(PROPERTY_HYPERDENSIFICATING, PROPERTY_NUTRITIOUS),\
+											PROPERTY_ENCEPHALOPHRASIVE = list(PROPERTY_NERVESTIMULATING, PROPERTY_PSYCHOSTIMULATING)))
 //List of all id's from classed /datum/reagent datums indexed by class or tier. Used by chemistry generator and chem spawners.
 GLOBAL_LIST_INIT_TYPED(chemical_gen_classes_list, /list, list("C" = list(),"C1" = list(),"C2" = list(),"C3" = list(),"C4" = list(),"C5" = list(),"C6" = list(),"T1" = list(),"T2" = list(),"T3" = list(),"T4" = list(),"tau", list()))
 //properties generated in chemicals, helps to make sure the same property doesn't show up 10 times

code/controllers/subsystem/communications.dm

@@ -115,6 +115,7 @@ Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency
 #define SOF_FREQ 1472
 #define PVST_FREQ 1473
 #define CBRN_FREQ 1474
+#define FORECON_FREQ 1475
 
 //Ship department channels
 #define SENTRY_FREQ 1480
@@ -171,6 +172,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	SQUAD_MARINE_CRYO = CRYO_FREQ,
 	SQUAD_SOF = SOF_FREQ,
 	SQUAD_CBRN = CBRN_FREQ,
+	SQUAD_FORECON = FORECON_FREQ,
 
 	RADIO_CHANNEL_ALAMO = DS1_FREQ,
 	RADIO_CHANNEL_NORMANDY = DS2_FREQ,
@@ -278,6 +280,7 @@ SUBSYSTEM_DEF(radio)
 		"[ECHO_FREQ]" = "echoradio",
 		"[CRYO_FREQ]" = "cryoradio",
 		"[CBRN_FREQ]" = "hcradio",
+		"[FORECON_FREQ]" = "hcradio",
 		"[SOF_FREQ]" = "hcradio",
 		"[HC_FREQ]" = "hcradio",
 		"[PVST_FREQ]" = "pvstradio",

code/datums/components/_component.dm

@@ -362,7 +362,8 @@
 	var/datum/component/C = dc[c_type]
 	if(C)
 		if(length(C))
-			C = C[1]
+			var/list/component_list = C
+			C = component_list[1]
 		if(C.type == c_type)
 			return C
 	return null

code/datums/emergency_calls/cbrn.dm

@@ -1,8 +1,8 @@
 /datum/emergency_call/cbrn
 	name = "CBRN (Squad)"
-	arrival_message = "A CBRN squad has been dispatched to your ship. Stand by."
+	arrival_message = "Attention, this is the USS Kurtz, we have dispatched a CBRN squad to your ship per your distress call. Stand by for arrival."
 	objectives = "Handle the chemical, biological, radiological, or nuclear threat. Further orders may be provided."
-	home_base = /datum/lazy_template/ert/weyland_station
+	home_base = /datum/lazy_template/ert/uscm_station
 	mob_min = 3
 	mob_max = 5
 	max_heavies = 0
@@ -41,7 +41,7 @@
 
 /datum/emergency_call/cbrn/ert
 	name = "CBRN (Distress)"
-	arrival_message = "Your distress signal has been received and we are dispatching the nearest CBRN squad to board with you now. Stand by."
+	arrival_message = "Attention, this is the USS Kurtz, we have dispatched a CBRN squad to your ship per your distress call. Stand by for arrival."
 	probability = 10
 
 /datum/emergency_call/cbrn/ert/New()

code/datums/emergency_calls/contractor.dm

@@ -87,7 +87,7 @@
 /datum/emergency_call/contractors/covert
 	name = "Military Contractors (Covert) (Hostile to WY)"
 	mob_max = 7
-	probability = 0
+	probability = 20
 	max_medics = 1
 	max_engineers = 1
 	max_heavies = 1

code/datums/emergency_calls/ert_stations.dm

@@ -15,3 +15,6 @@
 
 /datum/lazy_template/ert/pizza_station
 	map_name = "pizza_ert_station"
+
+/datum/lazy_template/ert/uscm_station
+	map_name = "uscm_ert_station"

code/datums/emergency_calls/forecon.dm

@@ -0,0 +1,62 @@
+/datum/emergency_call/forecon
+	name = "FORECON (Squad)"
+	arrival_message = "A Force Reconnaissance squad has been dispatched to your ship. Stand by."
+	objectives = "Handle whatever threat is present. Further orders may be provided."
+	home_base = /datum/lazy_template/ert/weyland_station
+	probability = 0
+	mob_min = 3
+	mob_max = 6
+
+	max_heavies = 1
+	max_medics = 1
+	max_smartgunners = 1
+
+/datum/emergency_call/forecon/create_member(datum/mind/new_mind, turf/override_spawn_loc)
+	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
+
+	if(!istype(spawn_loc))
+		return //Didn't find a useable spawn point.
+
+	var/mob/living/carbon/human/mob = new(spawn_loc)
+	new_mind.transfer_to(mob, TRUE)
+
+	if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))
+		leader = mob
+		arm_equipment(mob, /datum/equipment_preset/uscm/forecon/squad_leader, TRUE, TRUE)
+		to_chat(mob, SPAN_ROLE_HEADER("You are the FORECON Squad Leader!"))
+
+	else if(medics < max_medics && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(mob.client, JOB_SQUAD_MEDIC, time_required_for_job))
+		medics++
+		arm_equipment(mob, /datum/equipment_preset/uscm/forecon/tech, TRUE, TRUE)
+		to_chat(mob, SPAN_ROLE_HEADER("You are the FORECON Support Technician!"))
+
+	else if(smartgunners < max_smartgunners && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(mob.client, JOB_SQUAD_SMARTGUN))
+		smartgunners++
+		to_chat(mob, SPAN_ROLE_HEADER("You are a FORECON Smartgunner!"))
+		arm_equipment(mob, /datum/equipment_preset/uscm/forecon/smartgunner, TRUE, TRUE)
+
+	else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST))
+		heavies++
+		to_chat(mob, SPAN_ROLE_HEADER("You are a FORECON Designated Marskman!"))
+		arm_equipment(mob, /datum/equipment_preset/uscm/forecon/marksman, TRUE, TRUE)
+
+	else
+		arm_equipment(mob, /datum/equipment_preset/uscm/forecon/standard, TRUE, TRUE)
+		to_chat(mob, SPAN_ROLE_HEADER("You are a FORECON Rifleman!"))
+
+	to_chat(mob, SPAN_ROLE_BODY("You are a member of the USCM's Force Reconnisance. FORECON is a force that specializes in special operations behind enemy lines, or conducting reconnisance in situations regular Marines are not expected to handle."))
+	addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, SPAN_BOLD("Objectives:</b> [objectives]")), 1 SECONDS)
+
+/datum/emergency_call/forecon/platoon
+	name = "FORECON (Platoon)"
+	mob_min = 6
+	mob_max = 30
+	probability = 0
+	max_medics = 6
+	max_heavies = 1
+	max_smartgunners = 2
+
+/datum/emergency_call/forecon/platoon/New()
+	..()
+	arrival_message = "A Force Reconnaissance squad has been dispatched to your ship. Stand by."
+	objectives = "Handle whatever threat is present. Further orders may be provided."

code/datums/supply_packs/restricted_equipment.dm

@@ -21,3 +21,23 @@
 	containertype = /obj/structure/closet/crate
 	containername = "M4 pattern marine armor crate"
 	group = "Restricted Equipment"
+
+/datum/supply_packs/intel_kit
+	name = "Field Intelligence Support Kit crate (x1 fulton pack, x1 data detector, x1 intel pamphlet, x1 large document pouch, 1x intel radio key)"
+	contains = list(
+		/obj/item/storage/box/kit/mini_intel,
+	)
+	cost = 20
+	containertype = /obj/structure/closet/crate
+	containername = "Field Intelligence Support Kit crate"
+	group = "Restricted Equipment"
+
+/datum/supply_packs/jtac_kit
+	name = "JTAC Radio Kit crate (x1 full flare gun belt, x2 M89-S signal flare packs, 1x laser designator, 1x jtac radio key, 1x radiopack)"
+	contains = list(
+		/obj/item/storage/box/kit/mini_jtac,
+	)
+	cost = 30
+	containertype = /obj/structure/closet/crate
+	containername = "JTAC Radio Kit crate"
+	group = "Restricted Equipment"

code/game/area/admin_level.dm

@@ -125,6 +125,10 @@
 	name = "Weyland-Yutani Station"
 	icon_state = "red"
 
+/area/adminlevel/ert_station/uscm_station
+	name = "USCM Station"
+	icon_state = "green"
+
 /area/adminlevel/ert_station/freelancer_station
 	name = "Freelancer Station"
 	icon_state = "yellow"

code/game/jobs/job/marine/squads.dm

@@ -221,6 +221,18 @@
 	roundstart = FALSE
 	locked = TRUE
 
+/datum/squad/marine/forecon
+	name = SQUAD_FORECON
+	equipment_color = "#32CD32"
+	chat_color = "#32CD32"
+	radio_freq = FORECON_FREQ
+	minimap_color = "#32CD32"
+
+	active = FALSE
+	roundstart = FALSE
+	locked = TRUE
+
+
 //############################### UPP Squads
 /datum/squad/upp
 	name = "Root"

code/game/machinery/computer/HolodeckControl.dm

@@ -14,6 +14,12 @@
 /turf/open/floor/holofloor/attackby(obj/item/W as obj, mob/user as mob)
 	return
 
+/turf/open/floor/holofloor/cult
+	icon_state = "cult"
+
+/turf/open/floor/holofloor/cult/south
+	dir = SOUTH
+
 /turf/open/floor/holofloor/grass
 	name = "lush grass"
 	icon_state = "grass1"

code/game/machinery/telecomms/presets.dm

@@ -458,7 +458,7 @@ GLOBAL_LIST_EMPTY(all_static_telecomms_towers)
 	id = "CentComm Receiver"
 	network = "tcommsat"
 	autolinkers = list("receiverCent")
-	freq_listening = list(WY_WO_FREQ, PMC_FREQ, DUT_FREQ, YAUT_FREQ, HC_FREQ, PVST_FREQ, SOF_FREQ, CBRN_FREQ)
+	freq_listening = list(WY_WO_FREQ, PMC_FREQ, DUT_FREQ, YAUT_FREQ, HC_FREQ, PVST_FREQ, SOF_FREQ, CBRN_FREQ, FORECON_FREQ)
 
 //Buses
 

code/game/machinery/vending/cm_vending.dm

@@ -1307,7 +1307,8 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list(
 		var/obj/item/item_ref = myprod[3]
 		var/priority = myprod[priority_index]
 		if(islist(item_ref)) // multi-vending
-			item_ref = item_ref[1]
+			var/list/ref_list = item_ref
+			item_ref = ref_list[1]
 
 		var/is_category = item_ref == null
 

code/game/machinery/vending/vendor_types/crew/staff_officer_armory.dm

@@ -18,6 +18,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer_armory, list(
 		list("Marine Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY),
 		list("MRE", 0, /obj/item/storage/box/MRE, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY),
 		list("Aviator Shades", 0, /obj/item/clothing/glasses/sunglasses/aviator, MARINE_CAN_BUY_GLASSES, VENDOR_ITEM_REGULAR),
+		list("Bayonet", 0, /obj/item/attachable/bayonet, null, VENDOR_ITEM_REGULAR),
 
 		list("SPECIALISATION KIT (CHOOSE 1)", 0, null, null, null),
 		list("Essential Engineer Set", 0, /obj/effect/essentials_set/engi, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_RECOMMENDED),
@@ -68,6 +69,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer_armory, list(
 
 		list("OTHER SUPPLIES", 0, null, null, null),
 		list("Medical Helmet Optic", 5, /obj/item/device/helmet_visor/medical, null, VENDOR_ITEM_REGULAR),
+		list("Welding Visor", 5, /obj/item/device/helmet_visor/welding_visor, null, VENDOR_ITEM_REGULAR),
 		list("Magnetic Harness", 12, /obj/item/attachable/magnetic_harness, null, VENDOR_ITEM_REGULAR),
 		list("Radio Telephone Pack", 15, /obj/item/storage/backpack/marine/satchel/rto, null, VENDOR_ITEM_RECOMMENDED),
 		list("Binoculars", 5,/obj/item/device/binoculars, null, VENDOR_ITEM_REGULAR),
@@ -78,6 +80,10 @@ GLOBAL_LIST_INIT(cm_vending_clothing_staff_officer_armory, list(
 		list("Fulton Recovery Device", 5, /obj/item/stack/fulton, null, VENDOR_ITEM_REGULAR),
 		list("Motion Detector", 5, /obj/item/device/motiondetector, null, VENDOR_ITEM_REGULAR),
 		list("Space Cleaner", 2, /obj/item/reagent_container/spray/cleaner, null, VENDOR_ITEM_REGULAR),
+		list("Blowtorch", 5, /obj/item/tool/weldingtool, null, VENDOR_ITEM_REGULAR),
+		list("Wrench", 1, /obj/item/tool/wrench, null, VENDOR_ITEM_REGULAR),
+		list("Crowbar", 1, /obj/item/tool/crowbar, null, VENDOR_ITEM_REGULAR),
+		list("Entrenching Tool", 1, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_REGULAR),
 		list("Whistle", 5, /obj/item/device/whistle, null, VENDOR_ITEM_REGULAR),
 		list("Machete Scabbard (Full)", 5, /obj/item/storage/large_holster/machete/full, null, VENDOR_ITEM_REGULAR)
 	))

code/game/machinery/vending/vendor_types/intelligence_officer.dm

@@ -52,6 +52,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_intelligence_officer, list(
 
 		list("RADIO KEYS", 0, null, null, null),
 		list("Intel Radio Encryption Key", 5, /obj/item/device/encryptionkey/intel, null, VENDOR_ITEM_REGULAR),
+
+		list("SPARE INTEL KIT", 0, null, null, null),
+		list("Field Intelligence Support Kit (For untrained personnel)", 20, /obj/item/storage/box/kit/mini_intel, null, VENDOR_ITEM_REGULAR),
 	))
 
 /obj/structure/machinery/cm_vending/gear/intelligence_officer

code/game/objects/items/devices/radio/headset.dm

@@ -897,6 +897,14 @@
 	ignore_z = TRUE
 	has_hud = TRUE
 
+/obj/item/device/radio/headset/distress/forecon
+	name = "\improper Force Recon headset"
+	desc = "A headset given to FORECON marines. Channels are as follows: :g - public, :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel"
+	frequency = FORECON_FREQ
+	initial_keys = list(/obj/item/device/encryptionkey/public, /obj/item/device/encryptionkey/mcom)
+	ignore_z = TRUE
+	has_hud = TRUE
+
 /obj/item/device/radio/headset/distress/pmc/hvh
 	desc = "A special headset used by corporate personnel. Channels are as follows: :o - colony."
 	initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/WY)

code/game/objects/items/devices/scanners.dm

@@ -340,6 +340,21 @@ FORENSIC SCANNER
 	ex_potential = 0
 	int_potential = 0
 	rad_potential = 0
+
+	if(istype(O, /obj/item/ammo_magazine/flamer_tank))
+		var/obj/item/ammo_magazine/flamer_tank/tank = O
+		if(!length(tank.reagents.reagent_list))
+			to_chat(user, SPAN_NOTICE("No fuel detected in [O]"))
+			return
+		var/result
+		var/datum/reagent/chem = tank.reagents.reagent_list[1]
+		result += SPAN_BLUE("Fuel Statistics:")
+		result += SPAN_BLUE("<br>Intensity: [min(chem.intensityfire, tank.max_intensity)]")
+		result += SPAN_BLUE("<br>Duration: [min(chem.durationfire, tank.max_duration)]")
+		result += SPAN_BLUE("<br>Range: [min(chem.rangefire, tank.max_range)]")
+		to_chat(user, SPAN_NOTICE("[result]"))
+		return
+
 	if(istype(O,/obj/item/explosive))
 		var/obj/item/explosive/E = O
 		if(!E.customizable)

code/game/supplyshuttle.dm

@@ -1115,7 +1115,7 @@ GLOBAL_DATUM_INIT(supply_controller, /datum/controller/supply, new())
 	else if (href_list["rreq"])
 		var/ordernum = text2num(href_list["rreq"])
 		temp = "Invalid Request.<BR>"
-		for(var/i=1, length(i<=GLOB.supply_controller.requestlist), i++)
+		for(var/i=1, i<=length(GLOB.supply_controller.requestlist), i++)
 			var/datum/supply_order/SO = GLOB.supply_controller.requestlist[i]
 			if(SO.ordernum == ordernum)
 				GLOB.supply_controller.requestlist.Cut(i,i+1)