maps

code/__DEFINES/maps.dm

@@ -37,6 +37,7 @@ require only minor tweaks.
 #define ZTRAIT_ICE_RUINS_UNDERGROUND "Ice Ruins Underground"
 #define ZTRAIT_ISOLATED_RUINS "Isolated Ruins" //Placing ruins on z levels with this trait will use turf reservation instead of usual placement.
 #define ZTRAIT_VIRTUAL_REALITY "Virtual Reality"
+#define ZTRAIT_FASTFOOD "Fast Food Restaurant" //GS12
 
 //boolean - weather types that occur on the level
 #define ZTRAIT_SNOWSTORM "Weather_Snowstorm"

code/controllers/subsystem/mapping.dm

@@ -313,6 +313,7 @@ SUBSYSTEM_DEF(mapping)
 		LoadGroup(FailedZs, "Lavaland", "map_files/Mining", "Lavaland.dmm", default_traits = ZTRAITS_LAVALAND)
 		LoadGroup(FailedZs, "Lavaland_Lower", "map_files/Mining", "Lavaland_Lower.dmm", default_traits = ZTRAITS_LAVALAND_UNDERRGOUND)
 		LoadGroup(FailedZs, "Lavaland_Demone", "map_files/Mining", "Lavaland_Demone.dmm", default_traits = ZTRAITS_LAVALAND_UNDERRGOUND)
+		LoadGroup(FailedZs, "Fast_Food", "map_files/gs13", "Fast_Food.dmm", default_traits = ZTRAITS_FASTFOOD) //GS13
 	else if (!isnull(config.minetype) && config.minetype != "none")
 		INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!")
 #endif

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -644,6 +644,7 @@
 		/obj/machinery/vending/engineering = "Robco Tool Maker",
 		/obj/machinery/vending/sovietsoda = "BODA",
 		/obj/machinery/vending/security = "SecTech",
+		/obj/machinery/vending/mealdor = "Meal Vendor", //GS13 EDIT
 		// /obj/machinery/vending/modularpc = "Deluxe Silicate Selections",
 		/obj/machinery/vending/custom = "Custom Vendor")
 

code/modules/vending/_vending.dm

@@ -182,6 +182,13 @@
  * * TRUE - all other cases
  */
 /obj/machinery/vending/Initialize(mapload)
+	//GS13 EDIT START
+	if(free)
+		default_price = 0
+		extra_price = 0
+		scan_id = 0 // Why would we do this? Shit's free.
+
+	//GS13 EDIT END
 	var/build_inv = FALSE
 	if(!refill_canister)
 		circuit = null
@@ -322,6 +329,11 @@ GLOBAL_LIST_EMPTY(vending_products)
 		///Prices of vending machines are all increased uniformly.
 		R.custom_price = initial(temp.custom_price)
 		R.custom_premium_price = initial(temp.custom_premium_price)
+		//GS13 EDIT
+		if(free)
+			R.custom_price = 0
+			R.custom_premium_price = 0
+		//GS13 EDIT END
 		// R.age_restricted = initial(temp.age_restricted)
 		// R.colorable = !!(initial(temp.greyscale_config) && initial(temp.greyscale_colors) && (initial(temp.flags_1) & IS_PLAYER_COLORABLE_1))
 		recordlist += R