Card Shark DLC - GIMMIE MY MONEY OR I BREAK YOUR KNEECAPS (#64200)

Co-authored-by: Seth Scherer <supernovaa41@gmx.com>
Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>

code/modules/holodeck/holo_effect.dm

@@ -23,43 +23,16 @@
 /obj/effect/holodeck_effect/proc/safety(active)
 	return
 
-
 // Generates a holodeck-tracked card deck
 /obj/effect/holodeck_effect/cards
-	icon = 'icons/obj/toy.dmi'
-	icon_state = "deck_nanotrasen_full"
-	var/obj/item/toy/cards/deck/deck
+	icon = 'icons/obj/playing_cards.dmi'
+	icon_state = "deck_syndicate_full"
 
-/obj/effect/holodeck_effect/cards/activate(obj/machinery/computer/holodeck/HC)
-	deck = new(loc)
-	safety(!(HC.obj_flags & EMAGGED))
-	deck.holo = HC
-	RegisterSignal(deck, COMSIG_PARENT_QDELETING, .proc/handle_card_delete)
+/obj/effect/holodeck_effect/cards/activate(obj/machinery/computer/holodeck/holodeck)
+	var/obj/item/toy/cards/deck/syndicate/holographic/deck = new(loc, holodeck)
+	deck.flags_1 |= HOLOGRAM_1
 	return deck
 
-/obj/effect/holodeck_effect/cards/proc/handle_card_delete(datum/source)
-	SIGNAL_HANDLER
-	deck = null
-
-/obj/effect/holodeck_effect/cards/safety(active)
-	if(!deck)
-		return
-	if(active)
-		deck.card_hitsound = null
-		deck.card_force = 0
-		deck.card_throwforce = 0
-		deck.card_throw_speed = 3
-		deck.card_throw_range = 7
-		deck.card_attack_verb_continuous = string_list(list("attacks"))
-	else
-		deck.card_hitsound = 'sound/weapons/bladeslice.ogg'
-		deck.card_force = 5
-		deck.card_throwforce = 10
-		deck.card_throw_speed = 3
-		deck.card_throw_range = 7
-		deck.card_attack_verb_continuous = string_list(list("attacks", "slices", "dices", "slashes", "cuts"))
-
-
 /obj/effect/holodeck_effect/sparks/activate(obj/machinery/computer/holodeck/HC)
 	var/turf/T = get_turf(src)
 	if(T)

code/modules/holodeck/items.dm

@@ -32,6 +32,24 @@
 /obj/item/melee/energy/sword/holographic/red
 	sword_color_icon = "red"
 
+/obj/item/toy/cards/deck/syndicate/holographic
+	desc = "A deck of holographic playing cards."
+
+/obj/item/toy/cards/deck/syndicate/holographic/Initialize(mapload, obj/machinery/computer/holodeck/holodeck)
+	src.holodeck = holodeck
+	RegisterSignal(src, COMSIG_PARENT_QDELETING, .proc/handle_card_delete)
+	. = ..()
+
+/obj/item/toy/cards/deck/syndicate/holographic/proc/handle_card_delete(datum/source)
+	SIGNAL_HANDLER
+
+	//if any REAL cards have been inserted into the deck they are moved outside before destroying it
+	for(var/obj/item/toy/singlecard/card in cards)
+		if(card.flags_1 & HOLOGRAM_1)
+			continue
+		cards -= card
+		card.forceMove(drop_location())
+
 //BASKETBALL OBJECTS
 
 /obj/item/toy/beach_ball/holoball