From 5b0bfcde7a52e810e94845f17112b159f242ce13 Mon Sep 17 00:00:00 2001
From: Shadowfire <Jonasbangmoller@gmail.com>
Date: Mon, 2 Mar 2020 22:30:33 +0100
Subject: [PATCH] wip casino1

Made confetti sprite and system
Made a confetti grenade
Made special casino card deck and sprites that doesnt contain joker
made sofa constructible from wood, still needs more work
added new casino card decks to casino map
---
 code/game/machinery/casino_ch.dm              |  87 +++++++++++++++---
 code/game/objects/effects/effect_system_ch.dm |  64 +++++++++++++
 .../weapons/grenades/confetti_grenade.dm      |  31 +++++++
 code/modules/games/cards.dm                   |   2 +-
 code/modules/games/cards_ch.dm                |  46 +++++++++
 code/modules/materials/material_recipes_ch.dm |  12 ++-
 icons/effects/effects_ch.dmi                  | Bin 0 -> 1541 bytes
 icons/obj/playing_cards_ch.dmi                | Bin 0 -> 3577 bytes
 maps/southern_cross/southern_cross-casino.dmm |  10 +-
 nano/templates/Casino_prize_dispenser_ch.tmpl |  36 +-------
 vorestation.dme                               |   3 +
 11 files changed, 238 insertions(+), 53 deletions(-)
 create mode 100644 code/game/objects/effects/effect_system_ch.dm
 create mode 100644 code/game/objects/items/weapons/grenades/confetti_grenade.dm
 create mode 100644 code/modules/games/cards_ch.dm
 create mode 100644 icons/effects/effects_ch.dmi
 create mode 100644 icons/obj/playing_cards_ch.dmi

diff --git a/code/game/machinery/casino_ch.dm b/code/game/machinery/casino_ch.dm
index 34adb38328..65d744abcf 100644
--- a/code/game/machinery/casino_ch.dm
+++ b/code/game/machinery/casino_ch.dm
@@ -900,7 +900,7 @@
 
 
 /////////////CASINO PRIZE DISPENSER////////////////////////
-
+/*
 /obj/machinery/casino_prize_dispenser //WIP sprites and variables and prize lists
 	name = "Casino Prize Exchanger"
 	desc = "Exchange your chips to obtain wonderful prizes! Hoepfully you'll get to keep some of them for a while."
@@ -920,13 +920,27 @@
 	var/status_message = "" // Status screen messages like "insufficient funds", displayed in NanoUI
 	var/status_error = 0 // Set to 1 if status_message is an error
 
-	var/list/weapons	= list() // For each, use the following pattern:
-	var/list/gear		= list() // list(/type/path = amount,/type/path2 = amount2)
-	var/list/clothing 	= list() // No specified amount = only one in stock
-	var/list/misc 		= list()
-	var/list/drinks 	= list()
+	var/list/list_weapons	= list()
+	var/list/list_gear		= list()
+	var/list/list_clothing 	= list()
+	var/list/list_misc 		= list()
+	var/list/list_drinks 	= list()
 	var/list/prices     = list() // Prices for each item, list(/type/path = price), items not in the list don't have a price.
 
+	var/category_weapons	 = 1	//For listing categories, if false then prizes of this categories cant be obtained nor bought for post-shift enjoyment
+	var/category_gear		 = 1
+	var/category_clothing	 = 1
+	var/category_misc		 = 1
+	var/category_drinks		 = 1
+
+	var/list/product_categories = list(
+		list_weapons,
+		category_gear,
+		category_clothing,
+		category_misc,
+		category_drinks
+		)
+
 	// List of vending_product items available.
 	var/list/product_records = list()
 
@@ -941,7 +955,7 @@
 	var/list/log = list()
 	var/req_log_access = access_cargo //default access for checking logs is cargo
 	var/has_logs = 0 //defaults to 0, set to anything else for vendor to have logs
-
+*/
 
 	/*
 		var/list/all_products = list(
@@ -952,16 +966,12 @@
 		list("Booze", CAT_DRINKS))
 	*/
 
+/*
 /obj/machinery/casino_prize_dispenser/Initialize()
 	build_inventory()
 
 /obj/machinery/casino_prize_dispenser/proc/build_inventory() //WIP
-	var/list/all_products = list(
-		list(weapons, CAT_WEAPONS),
-		list(gear, CAT_GEAR),
-		list(clothing, CAT_CLOTHING),
-		list(misc, CAT_MISC),
-		list(drinks, CAT_DRINKS))
+
 
 	for(var/current_list in all_products)
 		var/category = current_list[2]
@@ -971,7 +981,8 @@
 
 			product.price = (entry in prices) ? prices[entry] : 0
 			product.category = category
-
+*/
+/*
 /obj/machinery/casino_prize_dispenser/Destroy()
 	for(var/datum/stored_item/vending_product/R in product_records)
 		qdel(R)
@@ -1056,6 +1067,7 @@
 				"color" = I.display_color)))
 
 		data["products"] = listed_products
+		data["categories"] = all_products
 
 	ui = SSnanoui.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if(!ui)
@@ -1116,4 +1128,49 @@
 /obj/machinery/casino_prize_dispenser/proc/do_logging(datum/stored_item/vending_product/R, mob/user, var/vending = 0) //WIP?
 	var/prize_log = "[user.ckey] playing as [user.name] bought a INSERT PORODUCT HERE."
 	log[++log.len] = prize_log
-	//Currently doesnt have in game way to show, to ensure theres no chance of players ckeys exposed - Jack
\ No newline at end of file
+	//Currently doesnt have in game way to show, to ensure theres no chance of players ckeys exposed - Jack
+*/
+/*
+<!--
+	Interface for vending machines
+	See: code/game/machinery/vending.dm
+-->
+
+{{if data.mode == 0}} <!-- Listing -->
+<h2>Items available</h2>
+<div class='item'>
+	{{for data.products}}
+	<div class='item'>
+			<div style='float'>
+				{{if value.price > 0}}
+					{{:helper.link('Buy (' + value.price + ')', 'cart', { "vend" : value.key }}}
+				{{else}}
+					{{:helper.link('Vend', 'circle-arrow-s', { "vend" : value.key }}}
+				{{/if}}
+			</div>
+		<div class='itemContent'>
+		{{if value.color}}<span style='color:{{:value.color}}'>{{:value.name}}</span>
+		{{else}}{{:value.name}}
+		</div>
+	</div>
+	{{empty}}
+	No items available!
+	{{/for}}
+</div>
+{{/if}}
+{{else data.mode == 1}} <!-- Payment screen -->
+<h2>Item selected</h2>
+<div class='item'>
+	<div class='item'>
+		<div class='itemLabel'>Item selected:</div> <div class='itemContent'>{{:data.product}}</div>
+		<div class='itemLabel'>Charge:</div> <div class='itemContent'>{{:data.price}}</div>
+	</div>
+	<div class='statusDisplay' style='overflow: auto;'>
+		{{if data.message_err}} <span class='uiIcon16 icon-alert' ></span>{{/if}} {{:data.message}}
+	</div>
+	<div class='item'>
+		{{:helper.link('Cancel', 'arrowreturn-1-w', {'cancelpurchase' : 1})}}
+	</div>
+</div>
+{{/if}}
+*/
\ No newline at end of file
diff --git a/code/game/objects/effects/effect_system_ch.dm b/code/game/objects/effects/effect_system_ch.dm
new file mode 100644
index 0000000000..08e80a19d5
--- /dev/null
+++ b/code/game/objects/effects/effect_system_ch.dm
@@ -0,0 +1,64 @@
+
+/////////////////////////////////////////////
+// Confetti and Glitter
+// Uses same system as smoke so can have directional travel
+/////////////////////////////////////////////
+
+/obj/effect/effect/confetti
+	name = "confetti"
+	icon = 'icons/effects/effects_ch.dmi'
+	icon_state = "confetti"
+	opacity = 1
+	anchored = 0.0
+	mouse_opacity = 0
+	var/amount = 6.0
+	var/time_to_live = 100
+
+/obj/effect/effect/confetti/New()
+	..()
+	if(time_to_live)
+		spawn (time_to_live)
+			if(!QDELETED(src))
+				qdel(src)
+
+/datum/effect/effect/system/confetti_spread
+	var/total_confetti = 0 // To stop it being spammed and lagging!
+	var/direction
+	var/confetti_type = /obj/effect/effect/confetti
+
+/datum/effect/effect/system/confetti_spread/set_up(n = 5, c = 0, loca, direct)
+	if(n > 10)
+		n = 10
+	number = n
+	cardinals = c
+	if(istype(loca, /turf/))
+		location = loca
+	else
+		location = get_turf(loca)
+	if(direct)
+		direction = direct
+
+/datum/effect/effect/system/confetti_spread/start(var/I)
+	var/i = 0
+	for(i=0, i<src.number, i++)
+		if(src.total_confetti > 20)
+			return
+		spawn(0)
+			if(holder)
+				src.location = get_turf(holder)
+			var/obj/effect/effect/confetti/confetti = new confetti_type(src.location)
+			src.total_confetti++
+			if(I)
+				confetti.color = I	//Allows us to do differently colored confetti
+			var/direction = src.direction
+			if(!direction)
+				if(src.cardinals)
+					direction = pick(cardinal)
+				else
+					direction = pick(alldirs)
+			for(i=0, i<pick(0,1,1,1,2,2,2,3), i++)
+				sleep(10)
+				step(confetti,direction)
+			spawn(confetti.time_to_live*0.75+rand(10,30))
+				if (confetti) qdel(confetti)
+				src.total_confetti--
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/grenades/confetti_grenade.dm b/code/game/objects/items/weapons/grenades/confetti_grenade.dm
new file mode 100644
index 0000000000..800b317dff
--- /dev/null
+++ b/code/game/objects/items/weapons/grenades/confetti_grenade.dm
@@ -0,0 +1,31 @@
+/obj/item/weapon/grenade/confetti
+	desc = "It is set to detonate in 2 seconds. These party grenades will make everyone jump with joy (or fright)!"
+	name = "grenatti"
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "grenade"
+	det_time = 20
+	item_state = "grenade"
+	slot_flags = SLOT_BELT
+	var/datum/effect/effect/system/confetti_spread
+	var/confetti_strength = 8
+
+/obj/item/weapon/grenade/confetti/New()
+	..()
+	src.confetti_spread = new /datum/effect/effect/system/confetti_spread()
+	src.confetti_spread.attach(src)
+
+/obj/item/weapon/grenade/confetti/Destroy()
+	qdel(confetti_spread)
+	confetti_spread = null
+	return ..()
+
+/obj/item/weapon/grenade/confetti/detonate() //Find a good confetti firework or pop sound effect later
+	playsound(src.loc, 'sound/effects/snap.ogg', 50, 1, -3)
+	src.confetti_spread.set_up(10, 0, usr.loc)
+	spawn(0)
+		for(var/i = 1 to confetti_strength)
+			src.confetti_spread.start()
+			sleep(10)
+		qdel(src)
+
+	return
\ No newline at end of file
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 08d762e093..8bf9c78e81 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -299,7 +299,7 @@
 /obj/item/weapon/hand
 	name = "hand of cards"
 	desc = "Some playing cards."
-	icon = 'icons/obj/playing_cards.dmi'
+	icon = 'icons/obj/playing_cards_ch.dmi' //CHOMPEDIT quickest solution to having custom chomp cards - Jack
 	icon_state = "empty"
 	w_class = ITEMSIZE_TINY
 
diff --git a/code/modules/games/cards_ch.dm b/code/modules/games/cards_ch.dm
new file mode 100644
index 0000000000..23fab1da12
--- /dev/null
+++ b/code/modules/games/cards_ch.dm
@@ -0,0 +1,46 @@
+/datum/playingcard/casino
+	name = "playing card"
+	card_icon = "card_back"
+	back_icon = "card_back"
+
+/obj/item/weapon/deck/casino
+	w_class = ITEMSIZE_SMALL
+	icon = 'icons/obj/playing_cards_ch.dmi'
+	list/cards = list()
+	cooldown = 0 // to prevent spam shuffle
+
+/obj/item/weapon/deck/holder/casino //WIP In future do a cool holder
+	name = "card box"
+	desc = "A small leather case to show how classy you are compared to everyone else."
+	icon = 'icons/obj/playing_cards_ch.dmi'
+	icon_state = "card_holder"
+
+/obj/item/weapon/deck/cards/casino
+	name = "deck of casino cards"
+	desc = "A deck of playing cards from the golden goose casino, comes without a joker card!"
+	icon = 'icons/obj/playing_cards_ch.dmi'
+	icon_state = "casino_deck"
+
+/obj/item/weapon/deck/cards/casino/New()
+	var/datum/playingcard/casino/P
+	for(var/suit in list("spades","clubs","diamonds","hearts"))
+
+		var/colour
+		if(suit == "spades" || suit == "clubs")
+			colour = "black_"
+		else
+			colour = "red_"
+
+		for(var/number in list("ace","two","three","four","five","six","seven","eight","nine","ten"))
+			P = new()
+			P.name = "[number] of [suit]"
+			P.card_icon = "casino_[colour]num"
+			P.back_icon = "casino_card_back"
+			cards += P
+
+		for(var/number in list("jack","queen","king"))
+			P = new()
+			P.name = "[number] of [suit]"
+			P.card_icon = "casino_[colour]col"
+			P.back_icon = "casino_card_back"
+			cards += P
\ No newline at end of file
diff --git a/code/modules/materials/material_recipes_ch.dm b/code/modules/materials/material_recipes_ch.dm
index a1d34d67be..d4e830b043 100644
--- a/code/modules/materials/material_recipes_ch.dm
+++ b/code/modules/materials/material_recipes_ch.dm
@@ -1,3 +1,13 @@
-/material/plasteel/generate_recipes() 
+/material/plasteel/generate_recipes()
 	. = ..()
 	recipes += new/datum/stack_recipe("Hammer Head", /obj/item/weapon/hammer_head, 2)
+
+
+/material/wood/generate_recipes() //Is a little sad we cant have lovely wooden sofa
+	. = ..()
+	recipes += new/datum/stack_recipe_list("sofas", list( \
+		new/datum/stack_recipe("sofa middle", /obj/structure/bed/chair/sofa, 1, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("sofa left", /obj/structure/bed/chair/sofa/left, 1, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("sofa right", /obj/structure/bed/chair/sofa/right, 1, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("sofa corner", /obj/structure/bed/chair/sofa/corner, 1, one_per_turf = 1, on_floor = 1), \
+		))
\ No newline at end of file
diff --git a/icons/effects/effects_ch.dmi b/icons/effects/effects_ch.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..f01cd218f3793f00ac9573757edce3a5f6732b36
GIT binary patch
literal 1541
zcmV+g2KxDlP)<h;3K|Lk000e1NJLTq006)M006)U0{{R3WdfWv0000sP)t-sz`($P
zf$)%!_n@Hv@bH2E|DgT-n}P6w_xF(Sfr0&-o16WckoS=HkdXhNprHSto16W>z`$JD
zhK~RM00DGTPE!Ct=GbNc004M;R9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9`^iy#0_2eo`
zEh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGfE(w;*!LYR3K9+IX^EgwWK6diHkEO
zv#1y-WXQ#tR+N~VS`5{elA4oP2@=<#2y!Vaxca$(-3S1-(J8JyUPx~M00j9-L_t(|
zob8?2a^gS?MIjp@gqi&R*UqFud6inNU9R+bN>ID)3$|tZB5^uBI6pl<olj{{tEM+?
z67cf+(v0W8ST!X8iT@w*oG6e1Eue}(WIMzQQUY1~$##{{yGjYL7B~rbdBffUd`fJ$
zXvIl^*mh7*0`Q41=#-Se_t*E`2ugsN!0YrEDu9ZE0;o7C@cpeh>BJRy>EjB;Nr5+H
z1SJquLkVcb5dlbi`Ue$2#|8Ua_a_8^2w0AQ;-tXO+b8xJb{sI*`=2|oDKa<$?;nr#
zHU#v<_W~||FU`0DP{1-it0n}t&XAOVbsTxGWq<;}xG0A`pagusW39M?)>P-OWy+=m
zwlXp$U>gU|c)iSLh_!${+qj*;y@1QD9bXOYJ%^J5pT1VNKALMLO29VWp#L1c6|iL|
zP;t$K2@oW>{&P4baCa06F8Um91t@`<qmYlwt$^K8sK@12fD+g{#safjfi1HD_`)Yl
zpyF2G0VM#tvP%&tdFVz9fUj0u1X2QIPZcQvNZey5r3FaNYqWqcfnJ$MBG3t1fR(^y
z82E^n*8^ZYE00+1!)bZMejhHDN7@2L9s!Z%5f`HJi2qeKip??j7=>Qx6&ARH5`e^$
zZCD1BfI2?2&;m;GnIRL;$K!JHnFSA0NP)zZ+y!Z$xoH8lSDETF8+cr~J~NP$SDpex
zAi6ElJ~JW!iBB)r@|jy80_J$Q&kU?rL%h!n%=@zl5f@_VGq<18Q3672*tS63V@Qq-
z>m?9i<&RJT>-fy`WSoaMg?#4zvpCD)3iX+rcsX2_KJ&B;Kgs3!%n%N@0)9TT1czGz
zOP^U!iqG6XN{`!DPRYmTQ3AEcpvb4q$|Dd4KJA`5-<0SOn3+c`NXR4HaXQ={DW&<e
z8;tS@-=|H?BQ`#5Vji(KqKo;=G2fLKKC>55K68@CW#==?>$qHDe?r1Ku0$J_Nn1c2
zpIP|j%_N`MxQ>gznAT@@sN;(EnNO-Zu1ufVq>d}oXI9p6EvV!(_t$Zi^_km%0_JG2
z&%9W3=QwJbV4rz0^LCN`IxY^jKC@jNSB}qYSjUy)GXrqyxC;5qvZs@Ud}c$JYw>ra
z&rHyN77zBBEq&UIJW{0|m;-oqGm%#htUAqBs0UW%k*s=PyF5bRRS#^JM^;Pa)&q0$
z2uw;nuq=<raH$8j@|i72@R@m|v^YId`X;50Ylq1(Sg0O&hg&V>udfGovtgs^fq%Wv
z>_|v0WnRBfqgu*p{X!S3=6yoqI<CXGlvtpc&m7$^RAa;D_6vQW@tJe`g?27R2|TIl
zxH5g_s{KMWwUnGXt_78RW=^46QJ=XDC}0^6^_hXSYKirkfmweR2<aE9_L-~J1CPGb
z(?3+aXdY=X`c99&(=&zYfsv_3-)TD=cJ!SdeWzRT0zUI%ndXe}RHN_o=sRu5=sP|7
zPFL#}x?%L4?xB#+Jo-+LzSA&k0mXl|k>0d|{X$o(?;kpTm$Hn{EPnc);4_ckr34om
zze_1wP~+1cg5wC#xq#7_`?S%7`?M~oecBuhecBxC>VfOPtK&K#RRsip8P=Y#dSFY!
z>bSh{spCpUU&oa~WF40amFl=$D7wFc6ui*najaVb0f!e*mZ*NAZdB<zZ9=g+t~Pca
rR}vAus#7_<fI$d{-%rZ*3+>_`dhAo-ws1(-00000NkvXXu0mjf6$s~}

literal 0
HcmV?d00001

diff --git a/icons/obj/playing_cards_ch.dmi b/icons/obj/playing_cards_ch.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..04e7af96fea1bdc28d0be2331143137d33c69f6e
GIT binary patch
literal 3577
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
O7qhi=uqZRT5cgjUMAD@I

literal 0
HcmV?d00001

diff --git a/maps/southern_cross/southern_cross-casino.dmm b/maps/southern_cross/southern_cross-casino.dmm
index 17b5821168..a6df8b7fce 100644
--- a/maps/southern_cross/southern_cross-casino.dmm
+++ b/maps/southern_cross/southern_cross-casino.dmm
@@ -54,7 +54,7 @@
 "bb" = (/obj/structure/window/reinforced{dir = 1},/obj/structure/flora/ausbushes/fullgrass,/turf/simulated/floor/grass,/area/casino/casino_ship)
 "bc" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/machinery/door/blast/shutters{id = "CasinoEmergency1"; layer = 3.5; name = "Casino emergency shutter"},/turf/simulated/floor,/area/casino/casino_ship)
 "bd" = (/obj/machinery/atm{pixel_y = -32},/turf/simulated/floor/carpet/gaycarpet,/area/casino/casino_ship)
-"be" = (/obj/structure/casino_table/blackjack_m{dir = 1},/obj/item/weapon/deck/cards,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
+"be" = (/obj/structure/table/reinforced,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards/casino,/obj/item/weapon/deck/cards/casino,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
 "bf" = (/obj/machinery/casino_chip_exchanger{pixel_x = 32},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
 "bg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/machinery/door/blast/shutters{id = "CasinoEmergency1"; layer = 3.5; name = "Casino emergency shutter"},/turf/simulated/floor,/area/casino/casino_ship)
 "bh" = (/obj/structure/table/marble,/obj/machinery/button/remote/blast_door{id = "Casinoboth"; name = "Both Shutters"; pixel_x = 26; pixel_y = -8; req_one_access = list(200)},/obj/machinery/button/remote/blast_door{id = "Casinoprizes"; name = "Prize Shutters"; pixel_x = 26; pixel_y = 8; req_one_access = list(200)},/obj/machinery/button/remote/blast_door{id = "CasinoEmergency2"; name = "Middle emergency shutters"; pixel_x = 0; pixel_y = 24; req_access = list(160)},/obj/item/weapon/paper_bin{pixel_y = 6},/obj/item/weapon/pen/blue,/obj/item/weapon/folder/red,/obj/item/weapon/spacecasinocash/c1000,/obj/item/weapon/spacecasinocash/c1000,/obj/item/weapon/spacecasinocash/c1000,/obj/item/weapon/spacecasinocash/c1000,/obj/item/weapon/spacecasinocash/c1000,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
@@ -436,7 +436,7 @@
 "it" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 8},/obj/machinery/door/window/brigdoor/southright{layer = 2.9; req_access = list(2,160)},/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/head/helmet/space/void/security,/obj/item/clothing/head/helmet/space/void/security,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right)
 "iu" = (/obj/structure/table/rack,/obj/structure/window/reinforced{dir = 1; health = 1e+006},/obj/structure/window/reinforced{dir = 4; health = 1e+006},/obj/machinery/door/window/brigdoor/southleft{layer = 2.9; req_access = list(2,160)},/obj/item/clothing/shoes/magboots,/obj/item/clothing/shoes/magboots,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/suit/space/void/security,/obj/item/clothing/head/helmet/space/void/security,/obj/item/clothing/head/helmet/space/void/security,/obj/item/clothing/mask/breath,/obj/item/clothing/mask/breath,/obj/item/weapon/tank/oxygen,/obj/item/weapon/tank/oxygen,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right)
 "iv" = (/obj/machinery/recharge_station,/turf/simulated/floor/tiled,/area/casino/casino_ship/wing_right)
-"iw" = (/obj/structure/table/reinforced,/obj/item/weapon/deck/cards{pixel_x = -8},/obj/item/weapon/deck/cards,/obj/item/weapon/deck/cards{pixel_x = 8},/obj/item/weapon/deck/cards{pixel_x = -8; pixel_y = 8},/obj/item/weapon/deck/cards{pixel_y = 8},/obj/item/weapon/deck/cards{pixel_x = 8; pixel_y = 8},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
+"iw" = (/obj/structure/casino_table/blackjack_m{dir = 1},/obj/item/weapon/deck/cards/casino,/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
 "ix" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/dicecup{pixel_x = -8},/obj/item/weapon/storage/dicecup,/obj/item/weapon/storage/dicecup{pixel_x = 8},/obj/item/weapon/storage/dicecup{pixel_x = -8; pixel_y = 8},/obj/item/weapon/storage/dicecup{pixel_y = 8},/obj/item/weapon/storage/dicecup{pixel_x = 8; pixel_y = 8},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
 "iy" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/dice{pixel_x = -8; pixel_y = -8},/obj/item/weapon/storage/pill_bottle/dice,/obj/item/weapon/storage/pill_bottle/dice{pixel_x = 8; pixel_y = 8},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
 "iz" = (/obj/structure/table/reinforced,/obj/item/weapon/storage/pill_bottle/dice_nerd{pixel_x = -8; pixel_y = -8},/obj/item/weapon/storage/pill_bottle/dice_nerd,/obj/item/weapon/storage/pill_bottle/dice_nerd{pixel_x = 8; pixel_y = 8},/turf/simulated/floor/carpet/blucarpet,/area/casino/casino_ship)
@@ -564,7 +564,7 @@ aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaababababababababababababbFauadadadanaGaHaHaKananauauancqawadbuadadbuadadaWbwaRbjbnaRaRaRaRaRaRbpadjeanananananananananananananauauauaueHauauauauauauauauauauauauauauauauauauauauauauauauauauauauaudzffenenenffdzfgeWfhdzfieWfidzdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaddedeadaaadanaGaHaHaKananauauancnawadaRaRaRaRaReNaRaRaRaRaRaRaRbKbKbKaRaRbsbtbviYiXiXiZaniYiXiXiZanbfadauauananadbWcEcEcEbbdfbVcEcEcEbVbXaAhZauauaBaObBbCbCbCcGcHcIdjdpauaudzdzdzfjdzdzdzdzdzdzdzdzdzdzdzdzdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabDbDbDbEbDbDbEbEbEbDdkdkaFbDgTanananananananauauaniQiRadadadadadadadbLclclclaRaRaRbKhibKaRaRbAbPbQczcWdgcAanczcWdgcAanananauauanbRadadadadhdhehehehfadadadadadadauaudmeaaneeaHaHefanaGaHdnauaudzfkflflflflflflflflflflfkdzfmfnfofodzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabDbDbDbDbJaSaTbJaSaTbObOaXbDaUhGanaGaHaHaKananauauananedecdsadcucRiLadcScScSddclaRaRbKbKbKaRaRbSawbTjajbjbjcanjajbjbjcanananauauanananbrbhadcFdVgWcQcTadiCiwixiyadauaudoebaneeaHaHefananbmdtauaudzflflflflflflflflflflflfldzfmfpfpfofqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabDbDbDbDbJaSaTbJaSaTbObOaXbDaUhGanaGaHaHaKananauauananedecdsadcucRiLadcScScSddclaRaRbKbKbKaRaRbSawbTjajbjbjcanjajbjbjcanananauauanananbrbhadcFdVgWcQcTadiCbeixiyadauaudoebaneeaHaHefananbmdtauaudzflflflflflflflflflflflfldzfmfpfpfofqaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEaSaTbDbJaSaTbJaSaTbObObObDaUhGanaGaHaHaKananauauanananananadhRaRaRaRaRaRaRddclaRaRaRaRaRaRaRbUawbPbtdfbVbWbXbtbVbXbVbYananauauauauaucKcMadcVdThgdTcUadiEananizadauauanananananananananananauaudzflflflfrfsftfufvfwfxflfldzfmfpfpfofyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEbHbOhcbObObObObObObObObObDaUhGanananananananauauanananananfXaRaRaRaRcLcLaRddaRaRaRaRaRaRaRaRbZcacbawawawbPcacbawawawbTananauauauauaubraniianananananiiananananhCauaugodZanananananananangoauauhDflflflfAfBfBfCfBfBfDflflhFfmfpfEfFfyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabEaSaTbDbJaSaTbJaSaTbObObObDaUhGancvcwcwcOananauauanananananadcLaRaRaRaRaRaRddclaRaRaRaRaRaRaRbUawbPcedhcfcgcgchcfdicfciananauauauauaubIcMadgXdWhhdWdXadiBananikadauauanananananananananananauaudzflflflfGfHfIfJfKfLfMflfldzfmfpfpfofyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
@@ -580,8 +580,8 @@ aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOhnfSfOfShohphqfShrhshpfSfThrhtiUiUiVadanananananananananananananananananananananananananananananananananananananananananananapawaddFdDdDdDdDdudFdDdDdDdDdudFdDdDdDdDdudFdDdDdDdDdudFdDdDdDdDdufmfmiOfmfmdzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOhnfSfOhvfVfShwfShrhshphxfOimgdiWiUiVadananiYiXiXiZaniYiXiXiXiZancdcdcdcdcdananananananananananananananancdcdcdcdcdanananananbAawaddNdDdDdDdDdudNdDdDdDdDdudNdDdDdDdDdudNdDdDdDdDdudNdDdDdDdDduiJiMdzhAhBdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfOfOfOfOfOfOfOfSfSfSfShxfOfOfOadadadadanancziXiXcAancziXiXiXcAancdavavavcdancdcdcdcdcdananancdcdcdcdcdancdavavavcdanananananbUcoaddDdDdEdFdGdudDdDdEdFdGdudDdDdEdFdGdudDdDdEdFdGdudDdDdEdFdGdudzdzdzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOitiuhEibicfSfOfShHhIhJhKfOfOfOadadadadazjejajbjbjcazcziXiXiXcAancdhjbehlcdancdavavavcdananancdavavavcdancdhjbehlcdanbMbNanbabScDaddvdxdxdxdydudvdxdxdxdydudvdxdxdxdydudvdxdxdxdydudvdxdxdxdydudzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfSfSfSfSfSfSidfShLfOfOfOfOaaaaaaaaaaadadinioioioipadjajbjbjdjcbacdiXavancdancdhjbehlcdananancdhjbehlcdancdanaviXcdananananadiqisadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOitiuhEibicfSfOfShHhIhJhKfOfOfOadadadadazjejajbjbjcazcziXiXiXcAancdhjiwhlcdancdavavavcdananancdavavavcdancdhjiwhlcdanbMbNanbabScDaddvdxdxdxdydudvdxdxdxdydudvdxdxdxdydudvdxdxdxdydudvdxdxdxdydudzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagagbfOfSfSfSfSfSfSidfShLfOfOfOfOaaaaaaaaaaadadinioioioipadjajbjbjdjcbacdiXavancdancdhjiwhlcdananancdhjiwhlcdancdanaviXcdananananadiqisadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOieifhOigihfSfOfOfOfOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadinioioioipadiqiririripadcdiXavancdanbaancdanaviXcdadiqiririsadiqiririsadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafOfOfOfOfOfOfOfOfOfOaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadiqiriririsadadadiqiriririsadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahPaaaaaaaaaaaaaaaaaaaa
diff --git a/nano/templates/Casino_prize_dispenser_ch.tmpl b/nano/templates/Casino_prize_dispenser_ch.tmpl
index cd49c67469..a3af9ce369 100644
--- a/nano/templates/Casino_prize_dispenser_ch.tmpl
+++ b/nano/templates/Casino_prize_dispenser_ch.tmpl
@@ -1,42 +1,16 @@
 <!-- 
-	Interface for vending machines 
-	See: code/game/machinery/vending.dm
+	Interface for casino prize dispenser
+	See: code/game/machinery/casino_ch.dm
 -->
 
 {{if data.mode == 0}} <!-- Listing -->
-<h2>Items available</h2>
+<h2>Prize categories</h2>
 <div class='item'>
-	{{for data.products}}
-	<div class='item'>
-			<div style='float'>
-				{{if value.price > 0}}
-					{{:helper.link('Buy (' + value.price + ')', 'cart', { "vend" : value.key }}}
-				{{else}}
-					{{:helper.link('Vend', 'circle-arrow-s', { "vend" : value.key }}}
-				{{/if}}
-			</div>
-		<div class='itemContent'>
-		{{if value.color}}<span style='color:{{:value.color}}'>{{:value.name}}</span>
-		{{else}}{{:value.name}}
-		</div>
+	{{for data.categories}}
 	</div>
 	{{empty}}
 	No items available!
 	{{/for}}
 </div>
-{{/if}}
-{{else data.mode == 1}} <!-- Payment screen -->
-<h2>Item selected</h2>
-<div class='item'>
-	<div class='item'>
-		<div class='itemLabel'>Item selected:</div> <div class='itemContent'>{{:data.product}}</div>
-		<div class='itemLabel'>Charge:</div> <div class='itemContent'>{{:data.price}}</div>
-	</div>
-	<div class='statusDisplay' style='overflow: auto;'>
-		{{if data.message_err}} <span class='uiIcon16 icon-alert' ></span>{{/if}} {{:data.message}}
-	</div>
-	<div class='item'>
-		{{:helper.link('Cancel', 'arrowreturn-1-w', {'cancelpurchase' : 1})}}
-	</div>
 </div>
-{{/if}}
\ No newline at end of file
+{{/if}}
diff --git a/vorestation.dme b/vorestation.dme
index 8bf6899fe9..11dbedfaa2 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -986,6 +986,7 @@
 #include "code\game\objects\weapons.dm"
 #include "code\game\objects\effects\bump_teleporter.dm"
 #include "code\game\objects\effects\effect_system.dm"
+#include "code\game\objects\effects\effect_system_ch.dm"
 #include "code\game\objects\effects\explosion_particles.dm"
 #include "code\game\objects\effects\gibs.dm"
 #include "code\game\objects\effects\glowshroom.dm"
@@ -1215,6 +1216,7 @@
 #include "code\game\objects\items\weapons\grenades\anti_photon_grenade.dm"
 #include "code\game\objects\items\weapons\grenades\chem_grenade.dm"
 #include "code\game\objects\items\weapons\grenades\concussion.dm"
+#include "code\game\objects\items\weapons\grenades\confetti_grenade.dm"
 #include "code\game\objects\items\weapons\grenades\emgrenade.dm"
 #include "code\game\objects\items\weapons\grenades\explosive.dm"
 #include "code\game\objects\items\weapons\grenades\flashbang.dm"
@@ -2103,6 +2105,7 @@
 #include "code\modules\games\cah_white_cards.dm"
 #include "code\modules\games\cardemon.dm"
 #include "code\modules\games\cards.dm"
+#include "code\modules\games\cards_ch.dm"
 #include "code\modules\games\dice.dm"
 #include "code\modules\games\spaceball_cards.dm"
 #include "code\modules\games\tarot.dm"