Conversion Kits + BoS changes (Ready for TM, work will continue) (#199)

Co-authored-by: Alexis <[email protected]> Co-authored-by: xTrainx <[email protected]> Co-authored-by: Marcus D. Johnston <[email protected]>
Foundation-19 · Sep 22, 2024 · eb83392 · eb83392
1 parent 1393133
commit eb83392
Show file tree

Hide file tree

Showing 27 changed files with 850 additions and 80 deletions.
diff --git a/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm b/_maps/map_files/Pahrump-AB/Pahrump-AB.dmm
@@ -49630,15 +49630,6 @@
 /obj/structure/reagent_dispensers/barrel/explosive,
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland)
-"otY" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt{
-	color = "000000"
-	},
-/turf/open/floor/f13{
-	icon_state = "reddirtyfull"
-	},
-/area/f13/brotherhood)
 "oue" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/dirt,
@@ -61994,6 +61985,15 @@
 	dir = 1
 	},
 /area/f13/wasteland)
+"tFw" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt{
+	color = "000000"
+	},
+/turf/open/floor/f13{
+	icon_state = "reddirtyfull"
+	},
+/area/f13/brotherhood)
 "tFG" = (
 /obj/structure/flora/grass/wasteland{
 	icon_state = "tall_grass_6"
@@ -104161,7 +104161,7 @@ pxe
 oHF
 tHV
 abg
-otY
+tFw
 wka
 jcI
 hRy

diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm
@@ -80,6 +80,7 @@
 #define CAT_CRAFTING	"Crafting"
 //#define CAT_ROBOT	"Electronics & Robots"
 #define CAT_FORGING	"Forging & Smithing"
+#define CAT_CONVERT "Armor Conversion"
 #define CAT_MISC	"Misc"
 #define CAT_SCAVENGING	"Scavenging & Tinkering"
 #define CAT_MISCELLANEOUS	"Miscellaneous"

diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
@@ -112,14 +112,15 @@
 #define F13SENIORPALADIN	(1<<2)
 #define F13PALADIN		(1<<3)
 #define F13KNIGHTCAPTAIN	(1<<4)
-#define F13SENIORKNIGHT	(1<<5)
-#define F13KNIGHT		(1<<6)
-#define F13HEADSCRIBE	(1<<7)
-#define F13SENIORSCRIBE (1<<8)
-#define F13SCRIBE		(1<<9)
-#define F13INITIATE		(1<<10)
-#define F13OFFDUTYBOS	(1<<11)
-#define F13ENVOY	(1<<12)
+#define F13KNIGHTSARGE	(1<<5)
+#define F13SENIORKNIGHT	(1<<6)
+#define F13KNIGHT		(1<<7)
+#define F13HEADSCRIBE	(1<<8)
+#define F13SENIORSCRIBE (1<<9)
+#define F13SCRIBE		(1<<10)
+#define F13INITIATE		(1<<11)
+#define F13OFFDUTYBOS	(1<<12)
+#define F13ENVOY	(1<<13)
 
 #define DEP_EASTWOOD (1<<6)
 
@@ -328,6 +329,7 @@
 #define JOB_DISPLAY_ORDER_SENIORPALADIN 69
 #define JOB_DISPLAY_ORDER_PALADIN 70
 #define JOB_DISPLAY_ORDER_KNIGHTCAPTAIN 71
+#define JOB_DISPLAY_ORDER_KNIGHTSARGE 72.9//lmao if it works don't brick it, time to copy you
 #define JOB_DISPLAY_ORDER_SENIORKNIGHT 72
 #define JOB_DISPLAY_ORDER_KNIGHT 73
 #define JOB_DISPLAY_ORDER_HEADSCRIBE 74
@@ -347,7 +349,7 @@
 #define JOB_DISPLAY_ORDER_SHOPKEEPER 87
 #define JOB_DISPLAY_ORDER_FAITHFUL 88// WHAT IS BITFLAG. WHAT DOES IT DO. WHERE IS THIS INFO USED.
 #define JOB_DISPLAY_ORDER_BANKER 89// IDK MAN BUT IT SEEMS IMPORTANT
-#define JOB_DISPLAY_ORDER_BARKEEP 90
+#define JOB_DISPLAY_ORDER_BARKEEP 90//you should fuck with it to see how bad it gets
 #define JOB_DISPLAY_ORDER_PILOT 91
 #define JOB_DISPLAY_ORDER_RADIOHOST 91.9
 
@@ -376,7 +378,7 @@
 #define JOB_DISPLAY_ORDER_F13USSCI 109
 #define JOB_DISPLAY_ORDER_F13USSGT 110
 #define JOB_DISPLAY_ORDER_F13USCPL 110.9	//Pain n suffering, but this does work without 10 more hours of changing numbers
-#define JOB_DISPLAY_ORDER_F13USSPC 111
+#define JOB_DISPLAY_ORDER_F13USSPC 111 //dont worry, I did the same thing for BoS sarge
 #define JOB_DISPLAY_ORDER_F13USPVT 112
 
 #define JOB_DISPLAY_ORDER_CHIEF 113

diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm
@@ -22,6 +22,7 @@
 				),
 				CAT_CRAFTING = list(
 					CAT_SCAVENGING,
+					CAT_CONVERT,
 					CAT_FORGING,
 					CAT_TOOL,
 					//CAT_ROBOT,