Ordnance Technician

#preprocessor/define/chemistry.dm

@@ -122,4 +122,10 @@
 #define PROPERTY_RAVENING			"ravening"
 #define PROPERTY_CURING				"curing"
 #define PROPERTY_OMNIPOTENT			"omnipotent"
+//Reaction Properties
+#define PROPERTY_FUELING			"fueling"
+#define PROPERTY_OXIDIZING			"oxidizing"
+#define PROPERTY_FLOWING			"flowing"
+#define PROPERTY_VISCOUS			"viscous"
+#define PROPERTY_EXPLOSIVE			"explosive"
 

#preprocessor/define/job.dm

@@ -38,7 +38,7 @@ var/global/list/JOB_COMMAND_ROLES_LIST  = list(JOB_CO, JOB_XO, JOB_SO)
 #define JOB_SEA                         "Senior Enlisted Advisor"
 
 #define JOB_CHIEF_ENGINEER              "Chief Engineer"
-#define JOB_ENGINEER                    "Maintenance Tech"
+#define JOB_ORDNANCE_TECH               "Ordnance Technician"
 
 #define JOB_CHIEF_REQUISITION           "Requisitions Officer"
 #define JOB_REQUISITION                 "Cargo Technician"

#preprocessor/define/misc.dm

@@ -99,6 +99,19 @@
 #define SIZE_HUGE       5       // Using Large does the same job
 #define SIZE_MASSIVE    6       
 
+// Stack amounts
+#define STACK_5			5
+#define STACK_10		10
+#define STACK_20		20
+#define STACK_25		25
+#define STACK_30		30
+#define STACK_50		50
+
+// Assembly Stages
+#define ASSEMBLY_EMPTY		0
+#define ASSEMBLY_UNLOCKED	1
+#define ASSEMBLY_LOCKED		2
+
 // Statistics defines
 #define STATISTIC_XENO "xeno"
 #define STATISTIC_HUMAN "human"

#preprocessor/define/mode.dm

@@ -107,7 +107,7 @@ var/list/be_special_flags = list(
 #define ROLEGROUP_MARINE_ENGINEERING 	2
 
 #define ROLE_CHIEF_ENGINEER				1
-#define ROLE_MAINTENANCE_TECH			2
+#define ROLE_ORDNANCE_TECH			2
 #define ROLE_REQUISITION_TECH			4
 //=================================================
 
@@ -138,7 +138,7 @@ var/list/be_special_flags = list(
 //Role defines, specifically lists of roles for job bans and the like.
 var/global/list/ROLES_COMMAND 		= list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_CREWMAN, JOB_POLICE, JOB_CORPORATE_LIAISON, JOB_CHIEF_REQUISITION, JOB_CHIEF_ENGINEER, JOB_CMO, JOB_CHIEF_POLICE, JOB_SEA, JOB_SYNTH)
 var/global/list/ROLES_OFFICERS		= list(JOB_CO, JOB_XO, JOB_SO, JOB_INTEL, JOB_PILOT, JOB_CREWMAN, JOB_SEA, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_POLICE, JOB_CORPORATE_LIAISON)
-var/global/list/ROLES_ENGINEERING 	= list(JOB_CHIEF_ENGINEER, JOB_ENGINEER)
+var/global/list/ROLES_ENGINEERING 	= list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH)
 var/global/list/ROLES_REQUISITION 	= list(JOB_CHIEF_REQUISITION, JOB_REQUISITION)
 var/global/list/ROLES_MEDICAL 	  	= list(JOB_CMO, JOB_DOCTOR, JOB_RESEARCHER)
 var/global/list/ROLES_MARINES	  	= list(JOB_SQUAD_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE)

#preprocessor/define/skills.dm

@@ -83,7 +83,7 @@
 #define SKILL_CONSTRUCTION_METAL    1   //metal barricade construction (CT)
 #define SKILL_CONSTRUCTION_PLASTEEL 2   //plasteel barricade,(Req)(combat engi)
 #define SKILL_CONSTRUCTION_ADVANCED 3   //windows and girder construction
-#define SKILL_CONSTRUCTION_MASTER   4   //building machine&computer frames (MT, CE)
+#define SKILL_CONSTRUCTION_MASTER   4   //building machine&computer frames (OT, CE)
 
 
 
@@ -93,7 +93,7 @@
 #define SKILL_ENGINEER_METAL    1   //barricade repair && c4 use
 #define SKILL_ENGINEER_PLASTEEL 2   //plasteel barricade deconstruction
 #define SKILL_ENGINEER_ENGI     3   //hacking&&planet engine fixing&&apc building (combat engi)
-#define SKILL_ENGINEER_MT       4   //Telecomms fixing, faster engine fixing (MT)
+#define SKILL_ENGINEER_OT       4   //Telecomms fixing, faster engine fixing (OT)
 //higher levels give faster Almayer engine repair.
 
 
@@ -142,7 +142,7 @@
 #define SKILL_POWERLOADER_DEFAULT   0
 #define SKILL_POWERLOADER_DABBLING  1 //Pilot
 #define SKILL_POWERLOADER_TRAINED   2 //CT, Req
-#define SKILL_POWERLOADER_PRO       3 //MT
+#define SKILL_POWERLOADER_PRO       3 //OT
 #define SKILL_POWERLOADER_MASTER    4 //CE
 
 

ColonialMarinesALPHA.dme

@@ -434,6 +434,7 @@
 #include "code\game\machinery\computer\card.dm"
 #include "code\game\machinery\computer\communications.dm"
 #include "code\game\machinery\computer\computer.dm"
+#include "code\game\machinery\computer\demo_sim.dm"
 #include "code\game\machinery\computer\dropship_weapons.dm"
 #include "code\game\machinery\computer\emails.dm"
 #include "code\game\machinery\computer\general_air_control.dm"
@@ -631,6 +632,7 @@
 #include "code\game\objects\items\explosives\explosive.dm"
 #include "code\game\objects\items\explosives\mine.dm"
 #include "code\game\objects\items\explosives\plastique.dm"
+#include "code\game\objects\items\explosives\warhead.dm"
 #include "code\game\objects\items\explosives\grenades\chem_grenade.dm"
 #include "code\game\objects\items\explosives\grenades\emgrenade.dm"
 #include "code\game\objects\items\explosives\grenades\flashbang.dm"

browserassets/css/browserOutput.css

@@ -264,6 +264,8 @@ a.popt {text-decoration: none;}
 .huge					{					font-size: 150%}
 
 .blue					{color: #0000ec;}
+.red 					{color: #ec0000;}
+.orange 				{color: #eca100;}
 
 .normal					{font-style: normal;}
 

browserassets/css/browserOutput_night.css

@@ -267,6 +267,8 @@ a.popt {text-decoration: none;}
 .huge					{					font-size: 150%}
 
 .blue					{color: #386aff;}
+.red 					{color: #ec0000;}
+.orange 				{color: #eca100;}
 
 .normal					{font-style: normal;}
 

code/__HELPERS/job.dm

@@ -64,7 +64,7 @@
 			JOB_INTEL,
 			JOB_CORPORATE_LIAISON,
 			JOB_CHIEF_ENGINEER,
-			JOB_ENGINEER,
+			JOB_ORDNANCE_TECH,
 			JOB_CHIEF_REQUISITION,
 			JOB_REQUISITION,
 			JOB_SQUAD_LEADER,

code/datums/skills.dm

@@ -271,7 +271,7 @@ CIVILIAN
 	skills = list(
 		SKILL_MEDICAL = SKILL_MEDICAL_CHEM,
 		SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
 		SKILL_SURVIVAL = SKILL_SURVIVAL_SURVIVOR
 	)
@@ -393,7 +393,7 @@ COMMAND STAFF
 /datum/skills/CE
 	name = "Chief Engineer"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
 		SKILL_LEADERSHIP = SKILL_LEAD_MASTER,
 		SKILL_POLICE = SKILL_POLICE_FLASH,
@@ -453,10 +453,10 @@ MILITARY NONCOMBATANT
 		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED
 	)
 
-/datum/skills/MT
-	name = "Maintenance Technician"
+/datum/skills/OT
+	name = "Ordnance Technician"
 	skills = list(
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER
 	)
@@ -478,7 +478,7 @@ SYNTHETIC
 	name = "Synthetic"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_MASTER,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_SMARTGUN = SKILL_SMART_TRAINED,
@@ -503,7 +503,7 @@ SYNTHETIC
 	name = "Early Synthetic"
 	skills = list(
 		SKILL_CQC = SKILL_MELEE_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
 		SKILL_FIREARMS = SKILL_FIREARMS_TRAINED,
 		SKILL_SMARTGUN = SKILL_SMART_TRAINED,
@@ -619,7 +619,7 @@ COLONIAL LIBERATION FRONT
 		SKILL_FIREARMS = SKILL_FIREARMS_UNTRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_BEGINNER,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
@@ -636,7 +636,7 @@ COLONIAL LIBERATION FRONT
 		SKILL_FIREARMS = SKILL_FIREARMS_UNTRAINED,
 		SKILL_LEADERSHIP = SKILL_LEAD_BEGINNER,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_SMALL,
 		SKILL_POLICE = SKILL_POLICE_MP,
@@ -652,7 +652,7 @@ COLONIAL LIBERATION FRONT
 	name = "CLF Leader"
 	skills = list(
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_TRAINED,
 		SKILL_VEHICLE = SKILL_VEHICLE_LARGE,
@@ -909,7 +909,7 @@ SPEC-OPS
 		SKILL_RIFLES = SKILL_RIFLES_TRAINED,
 		SKILL_SHOTGUNS = SKILL_SHOTGUNS_TRAINED,
 		SKILL_HEAVY_WEAPONS = SKILL_HEAVY_WEAPONS_TRAINED,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ADVANCED,
 		SKILL_LEADERSHIP = SKILL_LEAD_BEGINNER,
 		SKILL_MEDICAL = SKILL_MEDICAL_CHEM,
@@ -956,7 +956,7 @@ MISCELLANEOUS
 		SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN,
 		SKILL_LEADERSHIP = SKILL_LEAD_EXPERT,
 		SKILL_POWERLOADER = SKILL_POWERLOADER_DABBLING,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED
 	)
 
@@ -995,7 +995,7 @@ MISCELLANEOUS
 	name = "Yautja Warrior"
 	skills = list(
 		SKILL_CQC = SKILL_CQC_MASTER,
-		SKILL_ENGINEER = SKILL_ENGINEER_MT,
+		SKILL_ENGINEER = SKILL_ENGINEER_OT,
 		SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_MASTER,
 		SKILL_MEDICAL = SKILL_MEDICAL_CMO,
 		SKILL_SURGERY = SKILL_SURGERY_MASTER,

code/datums/supply_packs/misc.dm

@@ -3,28 +3,112 @@ SCIENCE
 *******************************************************************************/
 
 
-/datum/supply_packs/phoron
-	name = "phoron assembly crate"
+/datum/supply_packs/assembly
+	name = "assembly crate"
 	contains = list(
-					/obj/item/tank/phoron,
-					/obj/item/tank/phoron,
-					/obj/item/tank/phoron,
+					/obj/item/device/assembly/igniter,
+					/obj/item/device/assembly/igniter,
 					/obj/item/device/assembly/igniter,
 					/obj/item/device/assembly/igniter,
 					/obj/item/device/assembly/igniter,
 					/obj/item/device/assembly/prox_sensor,
 					/obj/item/device/assembly/prox_sensor,
 					/obj/item/device/assembly/prox_sensor,
+					/obj/item/device/assembly/prox_sensor,
+					/obj/item/device/assembly/prox_sensor,
+					/obj/item/device/assembly/timer,
+					/obj/item/device/assembly/timer,
 					/obj/item/device/assembly/timer,
 					/obj/item/device/assembly/timer,
 					/obj/item/device/assembly/timer
 					)
-	cost = RO_PRICE_PRICY
+	cost = RO_PRICE_VERY_CHEAP
+	containertype = /obj/structure/closet/crate/secure/phoron
+	containername = "assembly crate"
+	access = ACCESS_MARINE_ENGINEERING
+	group = "Science"
+
+/datum/supply_packs/pyrotec
+	name = "pyrotecnics crate"
+	contains = list(
+					/obj/item/reagent_container/glass/beaker/sulphuric,
+					/obj/item/reagent_container/glass/beaker/sulphuric,
+					/obj/item/reagent_container/glass/beaker/sulphuric,
+					/obj/item/reagent_container/glass/beaker/ethanol,
+					/obj/item/reagent_container/glass/beaker/ethanol,
+					/obj/item/reagent_container/glass/beaker/ethanol,
+					/obj/item/reagent_container/glass/beaker/large/phosphorus,
+					/obj/item/reagent_container/glass/beaker/large/phosphorus,
+					/obj/item/reagent_container/glass/beaker/large/phosphorus,
+					/obj/item/reagent_container/glass/beaker/large/lithium,
+					/obj/item/reagent_container/glass/beaker/large/lithium,
+					/obj/item/reagent_container/glass/beaker/large/sodiumchloride,
+					/obj/item/reagent_container/glass/beaker/large/sodiumchloride,
+					/obj/item/reagent_container/glass/beaker/large/potassiumchloride,
+					/obj/item/reagent_container/glass/beaker/large/potassiumchloride
+					)
+	cost = RO_PRICE_WORTHLESS
+	containertype = /obj/structure/closet/crate/secure/phoron
+	containername = "pyrotecnics crate"
+	access = ACCESS_MARINE_ENGINEERING
+	group = "Science"
+
+/datum/supply_packs/phoron
+	name = "phoron crate"
+	contains = list(
+					/obj/item/stack/sheet/mineral/phoron/medium_stack,
+					/obj/item/stack/sheet/mineral/phoron/medium_stack
+					)
+	cost = RO_PRICE_CHEAP
 	containertype = /obj/structure/closet/crate/secure/phoron
-	containername = "phoron assembly crate"
+	containername = "phoron crate"
 	access = ACCESS_MARINE_ENGINEERING
 	group = "Science"
 
+/datum/supply_packs/plastic
+	name = "plastic crate"
+	contains = list(
+					/obj/item/stack/sheet/mineral/plastic/small_stack,
+					/obj/item/stack/sheet/mineral/plastic/small_stack
+					)
+	cost = RO_PRICE_VERY_CHEAP
+	containertype = /obj/structure/closet/crate/secure/phoron
+	containername = "plastic crate"
+	access = ACCESS_MARINE_ENGINEERING
+	group = "Science"
+
+/datum/supply_packs/precious_metals
+	name = "precious metals crate"
+	contains = list(
+					/obj/item/stack/sheet/mineral/gold/small_stack,
+					/obj/item/stack/sheet/mineral/silver/small_stack,
+					/obj/item/stack/sheet/mineral/uranium/small_stack
+					)
+	cost = RO_PRICE_VERY_CHEAP
+	containertype = /obj/structure/closet/crate/secure/phoron
+	containername = "precious metals crate"
+	access = ACCESS_MARINE_ENGINEERING
+	group = "Science"
+
+/datum/supply_packs/exp_production
+	name = "explosives production crate"
+	contains = list(
+					/obj/item/reagent_container/glass/canister,
+					/obj/item/reagent_container/glass/canister,
+					/obj/item/reagent_container/glass/canister/ammonia,
+					/obj/item/reagent_container/glass/canister/ammonia,
+					/obj/item/reagent_container/glass/canister/methane,
+					/obj/item/reagent_container/glass/canister/methane,
+					/obj/item/reagent_container/glass/canister/oxygen,
+					/obj/item/reagent_container/glass/canister/oxygen,
+					/obj/item/reagent_container/glass/canister/pacid,
+					/obj/item/reagent_container/glass/canister/pacid
+					)
+	cost = RO_PRICE_VERY_CHEAP
+	containertype = /obj/structure/closet/crate/secure/phoron
+	containername = "explosives production crate"
+	access = ACCESS_MARINE_ENGINEERING
+	group = "Science"
 
 /*******************************************************************************
 SUPPLIES
@@ -206,10 +290,10 @@ SUPPLIES
 					/obj/item/storage/bag/trash,
 					/obj/item/reagent_container/spray/cleaner,
 					/obj/item/reagent_container/glass/rag,
-					/obj/item/explosive/grenade/chem_grenade/cleaner,
-					/obj/item/explosive/grenade/chem_grenade/cleaner,
-					/obj/item/explosive/grenade/chem_grenade/cleaner,
-					/obj/structure/mopbucket,
+					/obj/item/explosive/grenade/custom/cleaner,
+					/obj/item/explosive/grenade/custom/cleaner,
+					/obj/item/explosive/grenade/custom/cleaner,
+					/obj/item/reagent_container/glass/bucket/mopbucket,
 					/obj/item/paper/janitor
 					)
 	cost = RO_PRICE_WORTHLESS

code/game/area/almayer.dm

@@ -124,6 +124,9 @@
 	icon_state = "workshop"
 	fake_zlevel = 2 // lowerdeck
 
+/area/almayer/engineering/engineering_workshop/hangar
+	name = "\improper Ordnance workshop"
+
 /area/almayer/engineering/engine_core
 	name = "\improper Engine Reactor Core Room"
 	icon_state = "coreroom"

code/game/jobs/job/command.dm

@@ -211,7 +211,7 @@
 	minimum_playtimes = list(
 		JOB_SQUAD_ROLES = HOURS_9,
 		JOB_SQUAD_LEADER = HOURS_3,
-		JOB_ENGINEER = HOURS_3,
+		JOB_ORDNANCE_TECH = HOURS_3,
 		JOB_REQUISITION = HOURS_3,
 		JOB_DOCTOR = HOURS_3,
 		JOB_PILOT = HOURS_3,