Adds beginner loadout vendor. (#634)

* Adds Beginner loadouts. (#14261) * Beginner loadout vendor in valhalla works. (#15108) * Kwik-e-quip now checks if you already vended things from GHMME (#16251) * Robot beginner loadouts (#15930) * sort files properly * marine loadouts * engineer loadouts * corpsman loadouts * Update smartgunner.dm * Update engineer.dm * Update marine.dm * use defines * proper defines * proper defines * proper defines * robot loadouts * more robot loadouts * Update tgmc.dme * Update vending.dmi * Update holsters.dm * hmm * Update vending.dmi * Update holsters.dm * Update energy.dm * mre to boots, autoinjectors for helmets * Update corpsman.dm * engineer * Update smartgunner.dm * Update robot.dm * Update marine.dm * Update uniform.dm * Update beginner_tutorials.dm * proper sidearm attachments * Update robot.dm * Update robot.dm * papers for robots --------- Signed-off-by: Helg2 <[email protected]> Co-authored-by: Xander3359 <[email protected]> Co-authored-by: Ldip999 <[email protected]>
PMC-Unga-Marines · Nov 24, 2024 · 76ab671 · 76ab671
1 parent 5a1cea5
commit 76ab671
Show file tree

Hide file tree

Showing 55 changed files with 3,767 additions and 2,457 deletions.
diff --git a/_maps/map_files/Talos/TGS_Talos.dmm b/_maps/map_files/Talos/TGS_Talos.dmm
@@ -4238,6 +4238,9 @@
 /area/mainship/living/basketball)
 "cqy" = (
 /obj/machinery/loadout_vendor,
+/obj/structure/window{
+	dir = 4
+	},
 /turf/open/floor/mainship/red{
 	dir = 1
 	},
@@ -9586,6 +9589,15 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plating,
 /area/mainship/hull/port_hull)
+"fuK" = (
+/obj/structure/window{
+	dir = 8
+	},
+/obj/machinery/quick_vendor/beginner,
+/turf/open/floor/mainship/orange{
+	dir = 1
+	},
+/area/mainship/squads/bravo)
 "fuL" = (
 /obj/effect/turf_decal/siding/metal,
 /obj/machinery/camera/autoname{
@@ -9952,7 +9964,10 @@
 /turf/open/floor/mainship/metal,
 /area/mainship/hallways/hangar)
 "fKa" = (
-/obj/machinery/loadout_vendor,
+/obj/machinery/quick_vendor/beginner,
+/obj/structure/window{
+	dir = 8
+	},
 /turf/open/floor/mainship/emerald{
 	dir = 6
 	},
@@ -15462,6 +15477,9 @@
 /area/mainship/hallways/bow_hallway)
 "jsH" = (
 /obj/machinery/loadout_vendor,
+/obj/structure/window{
+	dir = 4
+	},
 /turf/open/floor/mainship/emerald,
 /area/mainship/squads/charlie)
 "jsI" = (
@@ -17406,7 +17424,10 @@
 /turf/open/floor/mainship/blue/full,
 /area/mainship/hallways/hangar)
 "kCI" = (
-/obj/machinery/loadout_vendor,
+/obj/machinery/quick_vendor/beginner,
+/obj/structure/window{
+	dir = 8
+	},
 /turf/open/floor/mainship/red{
 	dir = 5
 	},
@@ -21707,12 +21728,6 @@
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,
 /turf/open/floor/plating,
 /area/mainship/hull/starboard_hull)
-"mSl" = (
-/obj/structure/window{
-	dir = 8
-	},
-/turf/open/floor/mainship/blue,
-/area/mainship/squads/delta)
 "mSt" = (
 /obj/machinery/atmospherics/pipe/simple/cyan/hidden/layer1{
 	dir = 9
@@ -27154,14 +27169,6 @@
 /obj/structure/closet/firecloset,
 /turf/open/floor/plating,
 /area/mainship/hull/starboard_hull)
-"pWv" = (
-/obj/structure/window{
-	dir = 8
-	},
-/turf/open/floor/mainship/orange{
-	dir = 1
-	},
-/area/mainship/squads/bravo)
 "pWN" = (
 /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{
 	dir = 1
@@ -31131,6 +31138,9 @@
 /area/mainship/hallways/hangar)
 "snY" = (
 /obj/machinery/loadout_vendor,
+/obj/structure/window{
+	dir = 4
+	},
 /turf/open/floor/mainship/blue,
 /area/mainship/squads/delta)
 "soq" = (
@@ -31472,12 +31482,6 @@
 /obj/structure/prop/mainship/sensor_computer1,
 /turf/open/floor/mainship/black/full,
 /area/mainship/command/cic)
-"sAK" = (
-/obj/machinery/loadout_vendor,
-/turf/open/floor/mainship/orange{
-	dir = 1
-	},
-/area/mainship/squads/bravo)
 "sAW" = (
 /obj/structure/table/reinforced,
 /obj/machinery/computer/operating,
@@ -34686,10 +34690,10 @@
 /area/mainship/living/grunt_rnr)
 "uAy" = (
 /obj/machinery/light/mainship,
-/obj/machinery/loadout_vendor,
 /obj/structure/window{
-	dir = 4
+	dir = 8
 	},
+/obj/machinery/quick_vendor/beginner,
 /turf/open/floor/mainship/blue,
 /area/mainship/squads/delta)
 "uBb" = (
@@ -82160,7 +82164,7 @@ hwt
 sRd
 pTc
 xhq
-sAK
+iqo
 xZI
 fNK
 hFG
@@ -82417,7 +82421,7 @@ qvh
 dNU
 nJh
 xhq
-iqo
+fuK
 sEf
 lYT
 dme
@@ -82674,7 +82678,7 @@ nYl
 eDk
 pTc
 xhq
-pWv
+oZG
 sXV
 sFX
 nju
@@ -82719,7 +82723,7 @@ eWU
 bny
 aDy
 knz
-mSl
+igP
 tkN
 eDY
 bli

diff --git a/_maps/map_files/generic/Admin_Level.dmm b/_maps/map_files/generic/Admin_Level.dmm
@@ -648,10 +648,10 @@
 /turf/closed/mineral/smooth/indestructible,
 /area/centcom/valhalla)
 "jvi" = (
-/obj/machinery/marine_selector/clothes/valhalla,
 /obj/effect/turf_decal/warning_stripes/thick{
 	dir = 6
 	},
+/obj/machinery/quick_vendor/beginner,
 /turf/open/floor/iron/dark/textured,
 /area/centcom/valhalla)
 "jvR" = (
@@ -1011,13 +1011,13 @@
 /turf/open/floor/mainship/rubber,
 /area/centcom/valhalla)
 "nKg" = (
-/obj/machinery/marine_selector/clothes/valhalla,
 /obj/effect/turf_decal/warning_stripes/thick{
 	dir = 6
 	},
 /obj/effect/turf_decal/warning_stripes/thick{
 	dir = 8
 	},
+/obj/machinery/quick_vendor/beginner,
 /turf/open/floor/iron/dark/textured,
 /area/centcom/valhalla)
 "nOQ" = (

diff --git a/_maps/shuttles/tgs_bigbury.dmm b/_maps/shuttles/tgs_bigbury.dmm
@@ -1013,6 +1013,10 @@
 	},
 /turf/open/floor/mainship/blue,
 /area/shuttle/canterbury/cic)
+"Uc" = (
+/obj/machinery/quick_vendor/beginner,
+/turf/open/floor/mainship/mono,
+/area/shuttle/canterbury)
 "Ui" = (
 /obj/structure/window/reinforced{
 	dir = 4
@@ -1517,7 +1521,7 @@ an
 ac
 FQ
 Fl
-Fl
+Uc
 bG
 an
 ma
@@ -1590,7 +1594,7 @@ ab
 bG
 UO
 aO
-Fl
+Uc
 bA
 bA
 yp

diff --git a/_maps/shuttles/tgs_canterbury.dmm b/_maps/shuttles/tgs_canterbury.dmm
@@ -816,7 +816,7 @@
 /obj/structure/window/reinforced/toughened{
 	dir = 4
 	},
-/obj/machinery/loadout_vendor/crash,
+/obj/machinery/quick_vendor/beginner,
 /turf/open/floor/mainship/cargo,
 /area/shuttle/canterbury)
 "KE" = (

diff --git a/code/__DEFINES/equipment.dm b/code/__DEFINES/equipment.dm
@@ -117,6 +117,12 @@
 ///If a storage container can be restocked into a vendor
 #define BYPASS_VENDOR_CHECK (1<<0)
 
+//flags_id
+///If you can get buy a loadout
+#define CAN_BUY_LOADOUT (1<<0)
+///If you have used the GHMME
+#define USED_GHMME (1<<1)
+
 //==========================================================================================
 
 //flags_inv_hide

diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
@@ -159,14 +159,3 @@ GLOBAL_LIST_INIT(jobs_fallen_marine, typecacheof(list(/datum/job/fallen/marine),
 #define SILO_ORIGIN "xenos from silo generation"
 
 #define SQUAD_MAX_POSITIONS(total_positions) CEILING(total_positions / length(SSjob.active_squads), 1)
-
-/// How many points a marine can spend in job specific vendors by default
-#define DEFAULT_TOTAL_BUY_POINTS 45
-/// How many points a medic can spend on pills
-#define MEDIC_TOTAL_BUY_POINTS 45
-/// How many points an engineer can spend
-#define ENGINEER_TOTAL_BUY_POINTS 75
-/// How many points the field commander can spend
-#define COMMANDER_TOTAL_BUY_POINTS 45
-/// How many points the synthetic can spend
-#define SYNTH_TOTAL_BUY_POINTS 50
diff --git a/code/__DEFINES/loadout.dm b/code/__DEFINES/loadout.dm
@@ -16,6 +16,10 @@
 #define CAT_MOD "JAEGER STORAGE MODULES"
 #define CAT_ARMMOD "JAEGER ARMOR MODULES"
 
+// Synth Special Categories
+#define CAT_SMR "SUITS AND ARMOR" // Synth's suits
+#define CAT_SHN "HATS" // Synth's non-protective hats
+
 #define CAT_MEDSUP "MEDICAL SUPPLIES"
 #define CAT_ENGSUP "ENGINEERING SUPPLIES"
 #define CAT_LEDSUP "LEADER SUPPLIES"
@@ -26,9 +30,34 @@
 #define CAT_ROBOT "COMBAT ROBOT SUPPLIES"
 #define CAT_LOAD "LOADOUT"
 
-// Synth Special Categories
-#define CAT_SMR "SUITS AND ARMOR" // Synth's suits
-#define CAT_SHN "HATS" // Synth's non-protective hats
+/// How many points a marine can spend by default
+#define MARINE_TOTAL_BUY_POINTS 45
+/// How many points the robot can spend
+#define ROBOT_TOTAL_BUY_POINTS 45
+/// How many points the leader can spend
+#define LEADER_TOTAL_BUY_POINTS 45
+/// How many points the leader can spend
+#define SMARTGUNNER_TOTAL_BUY_POINTS 45
+/// How many points a medic can spend on pills
+#define MEDIC_TOTAL_BUY_POINTS 45
+/// How many points an engineer can spend
+#define ENGINEER_TOTAL_BUY_POINTS 75
+/// How many points the field commander can spend
+#define COMMANDER_TOTAL_BUY_POINTS 45
+/// How many points the synthetic can spend
+#define SYNTH_TOTAL_BUY_POINTS 50
+
+GLOBAL_LIST_INIT(default_marine_points, list(
+	CAT_MARINE = MARINE_TOTAL_BUY_POINTS,
+	CAT_ROBOT = ROBOT_TOTAL_BUY_POINTS,
+	CAT_SGSUP = SMARTGUNNER_TOTAL_BUY_POINTS,
+	CAT_ENGSUP = ENGINEER_TOTAL_BUY_POINTS,
+	CAT_LEDSUP = LEADER_TOTAL_BUY_POINTS,
+	CAT_MEDSUP = MEDIC_TOTAL_BUY_POINTS,
+	CAT_FCSUP = COMMANDER_TOTAL_BUY_POINTS,
+	CAT_SYNTH = SYNTH_TOTAL_BUY_POINTS,
+))
+
 
 #define VENDOR_FACTION_NEUTRAL "Neutral"
 #define VENDOR_FACTION_CRASH "Crash"
@@ -74,7 +103,7 @@ GLOBAL_LIST_INIT(marine_gear_listed_products, list(
 	/obj/structure/closet/crate/mortar_ammo/howitzer_kit = list(CAT_MARINE, "Howitzer kit", 35, "orange3"),
 	/obj/structure/closet/crate/mortar_ammo/mlrs_kit = list(CAT_MARINE, "MLRS kit", 35, "orange3"),
 	/obj/item/reagent_containers/hypospray/autoinjector/oxycodone = list(CAT_MARINE, "Oxycodone autoinjector", 5, "cyan"),
-	/obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjecto", 10, "cyan"),
+	/obj/item/reagent_containers/hypospray/autoinjector/russian_red = list(CAT_MARINE, "Emergency autoinjector", 10, "cyan"),
 	/obj/item/reagent_containers/hypospray/autoinjector/synaptizine	 = list(CAT_MARINE, "Synaptizine autoinjector", 8, "cyan"),
 	/obj/vehicle/ridden/motorbike = list(CAT_MARINE, "Bike", 30, "blue"),
 	/obj/item/sidecar = list(CAT_MARINE, "Bike sidecar", 8, "blue"),
@@ -685,7 +714,7 @@ GLOBAL_LIST_INIT(medic_clothes_listed_products, list(
 		/obj/item/armor_module/storage/uniform/holster = list(CAT_WEB, "Shoulder handgun holster", 0, "black"),
 		/obj/item/storage/belt/lifesaver/full = list(CAT_BEL, "Lifesaver belt", 0, "orange"),
 		/obj/item/storage/belt/rig/medical = list(CAT_BEL, "Rig belt", 0, "black"),
-		/obj/item/storage/belt/hypospraybelt = list(CAT_BEL, "Hypospray belt", 0, "black"),
+		/obj/item/storage/belt/hypospraybelt/full = list(CAT_BEL, "Hypospray belt", 0, "black"),
 		/obj/item/armor_module/module/welding = list(CAT_HEL, "Jaeger welding module", 0, "orange"),
 		/obj/item/armor_module/module/binoculars = list(CAT_HEL, "Jaeger binoculars module", 0, "orange"),
 		/obj/item/armor_module/module/artemis = list(CAT_HEL, "Jaeger Freyr module", 0, "orange"),
@@ -909,7 +938,7 @@ GLOBAL_LIST_INIT(synthetic_clothes_listed_products, list(
 		/obj/item/clothing/gloves/white = list(CAT_GLO, "White gloves", 0, "black"),
 		/obj/item/storage/belt/lifesaver/full = list(CAT_BEL, "Lifesaver belt", 0, "orange", "synth-attachable"),
 		/obj/item/storage/belt/rig/medical = list(CAT_BEL, "Rig belt", 0, "black"),
-		/obj/item/storage/belt/hypospraybelt = list(CAT_BEL, "Hypospray belt", 0, "black"),
+		/obj/item/storage/belt/hypospraybelt/full = list(CAT_BEL, "Hypospray belt", 0, "black"),
 		/obj/item/clothing/shoes/marine = list(CAT_SHO, "Marine combat boots", 0, "synth-rcmarmor"),
 		/obj/item/clothing/shoes/white = list(CAT_SHO, "White shoes", 0, "synth-armor"),
 		/obj/item/clothing/shoes/brown = list(CAT_SHO, "Brown shoes", 0, "synth-armor"),

diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm
@@ -481,6 +481,10 @@ GLOBAL_LIST_INIT(bitfields, list(
 	"flags_storage" = list(
 		"BYPASS_VENDOR_CHECK" = BYPASS_VENDOR_CHECK,
 	),
+	"flags_id" = list(
+		"CAN_BUY_LOADOUT" = CAN_BUY_LOADOUT,
+		"USED_GHMME" = USED_GHMME,
+	),
 	"ghost_hud" = list(
 		"GHOST_HUD_MED" = GHOST_HUD_MED,
 		"GHOST_HUD_SEC" = GHOST_HUD_SEC,