diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index ec6a53f308..adc662f31b 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -1172,6 +1172,23 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	resistance_flags = FIRE_PROOF
 	refill_canister = /obj/item/vending_refill/donksoft
 
+<<<<<<< HEAD
+=======
+/obj/machinery/vending/games
+	name = "\improper Good Clean Fun"
+	desc = "Vends things that the Captain and Head of Personnel are probably not going to appreciate you fiddling with instead of your job..."
+	product_ads = "Escape to a fantasy world!;Fuel your gambling addiction!;Ruin your friendships!;Roll for initative!;Elves and dwarves!;Paranoid computers!;Totally not satanic!;Fun times forever!"
+	icon_state = "games"
+	products = list(
+		/obj/item/toy/cards/deck = 5,
+		/obj/item/storage/pill_bottle/dice = 10,
+		/obj/item/toy/cards/deck/cas = 3,
+		/obj/item/toy/cards/deck/cas/black = 3)
+	contraband = list(/obj/item/dice/fudge = 9)
+	refill_canister = /obj/item/vending_refill/games
+
+
+>>>>>>> 9460277... Merge pull request #33316 from ShizCalev/games-vendor
 #undef STANDARD_CHARGE
 #undef CONTRABAND_CHARGE
 #undef COIN_CHARGE
\ No newline at end of file
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 1857a27593..8577c44b26 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -223,6 +223,7 @@
 							/obj/machinery/vending/snack = "Getmore Chocolate Corp",
 							/obj/machinery/vending/cola = "Robust Softdrinks",
 							/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
+							/obj/machinery/vending/games = "\improper Good Clean Fun",
 							/obj/machinery/vending/autodrobe = "AutoDrobe",
 							/obj/machinery/vending/clothing = "ClothesMate",
 							/obj/machinery/vending/medical = "NanoMed Plus",
diff --git a/code/game/objects/items/vending_items.dm b/code/game/objects/items/vending_items.dm
index e84295f8ed..0d2015b01a 100644
--- a/code/game/objects/items/vending_items.dm
+++ b/code/game/objects/items/vending_items.dm
@@ -86,3 +86,9 @@
 	icon_state = "refill_donksoft"
 	charges = list(32,28,0)// of 90 standard, 75 contraband, 0 premium
 	init_charges = list(32,28,0)
+
+/obj/item/vending_refill/games
+	machine_name = "\improper Good Clean Fun"
+	icon_state = "refill_games"
+	charges = list(7, 3, 0) //of 21 standard, 9 contraband
+	init_charges = list(7, 3, 0)
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index 13325a23c8..de62ba465e 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -1221,6 +1221,14 @@
 					/obj/item/vending_refill/cigarette)
 	crate_name = "cigarette supply crate"
 
+/datum/supply_pack/organic/vending/games
+	name = "Games Supply Crate"
+	cost = 1000
+	contains = list(/obj/item/vending_refill/games,
+					/obj/item/vending_refill/games,
+					/obj/item/vending_refill/games)
+	crate_name = "games supply crate"
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Materials ///////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
diff --git a/icons/obj/vending_restock.dmi b/icons/obj/vending_restock.dmi
index 7f8289a087..a59fdd0f52 100644
Binary files a/icons/obj/vending_restock.dmi and b/icons/obj/vending_restock.dmi differ