Merge pull request #8745 from Sishen1542/CASfix

Port of tg pull #44158, the fix of Cards Against Space!

code/game/objects/items/toys.dm

@@ -636,10 +636,13 @@
 	var/obj/machinery/computer/holodeck/holo = null // Holodeck cards should not be infinite
 	var/list/cards = list()
 
-/obj/item/toy/cards/deck/New()
-	..()
+/obj/item/toy/cards/deck/Initialize()
+	. = ..()
+	populate_deck()
+
+/obj/item/toy/cards/deck/proc/populate_deck()
 	icon_state = "deck_[deckstyle]_full"
-	for(var/i = 2; i <= 10; i++)
+	for(var/i in 2 to 10)
 		cards += "[i] of Hearts"
 		cards += "[i] of Spades"
 		cards += "[i] of Clubs"
@@ -664,6 +667,9 @@
 //ATTACK HAND IGNORING PARENT RETURN VALUE
 //ATTACK HAND NOT CALLING PARENT
 /obj/item/toy/cards/deck/attack_hand(mob/user)
+	draw_card(user)
+
+/obj/item/toy/cards/deck/proc/draw_card(mob/user)
 	if(user.lying)
 		return
 	var/choice = null
@@ -778,7 +784,7 @@
 /obj/item/toy/cards/cardhand/Topic(href, href_list)
 	if(..())
 		return
-	if(usr.stat || !ishuman(usr) || !usr.canmove)
+	if(usr.stat || !ishuman(usr))
 		return
 	var/mob/living/carbon/human/cardUser = usr
 	var/O = src
@@ -941,7 +947,6 @@
 	newobj.card_attack_verb = sourceobj.card_attack_verb
 	newobj.attack_verb = newobj.card_attack_verb
 
-
 /*
 || Syndicate playing cards, for pretending you're Gambit and playing poker for the nuke disk. ||
 */

code/modules/games/cas.dm

@@ -31,18 +31,17 @@
 	decksize = 50
 	card_text_file = "strings/cas_black.txt"
 
-/obj/item/toy/cards/deck/cas/Initialize()
-	. = ..()
+/obj/item/toy/cards/deck/cas/populate_deck()
 	var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt"))
 	allcards = cards_against_space[card_face]
 	var/list/possiblecards = allcards.Copy()
 	if(possiblecards.len < decksize) // sanity check
 		decksize = (possiblecards.len - 1)
 	var/list/randomcards = list()
-	while (randomcards.len < decksize)
+	for(var/x in 1 to decksize)
 		randomcards += pick_n_take(possiblecards)
-	for(var/i=1 to randomcards.len)
-		var/cardtext = randomcards[i]
+	for(var/x in 1 to randomcards.len)
+		var/cardtext = randomcards[x]
 		var/datum/playingcard/P
 		P = new()
 		P.name = "[cardtext]"
@@ -50,7 +49,7 @@
 		cards += P
 	if(!blanks)
 		return
-	for(var/x=1 to blanks)
+	for(var/x in 1 to blanks)
 		var/datum/playingcard/P
 		P = new()
 		P.name = "Blank Card"
@@ -58,10 +57,7 @@
 		cards += P
 	shuffle_inplace(cards) // distribute blank cards throughout deck
 
-/obj/item/toy/cards/deck/cas/attack_hand(mob/user)
-	. = ..()
-	if(.)
-		return
+/obj/item/toy/cards/deck/cas/draw_card(mob/user)
 	if(user.lying)
 		return
 	if(cards.len == 0)

strings/cas_black.txt

@@ -1,13 +1,13 @@
 Today, Security killed ____.
 Security, the clown's breaking into ____.
-The Chaplain is worshiping the Church of _____.
+Our last Chaplain believed in nothing but _____.
 What angered the gods this time?
 Why didn't engineering set up the singularity?
 What does the traitor steal this time?
 Cargo: There's a galaxy-wide shortage of _______.
 I don't care what they called me back on the station, I'm not a traitor. I'm a man of _________.
 The Syndicate is offering crew members _________ to defect. 
-Cargo ordered a crate full of _____.
+What is Nanotrasen's highest-priority bounty?
 What is the gray tide protesting this time?
 If the Space Gods didn't want _________ they wouldn't have given us __________.
 Why was the death squad sent in?
@@ -30,11 +30,10 @@ What made the nuclear operatives fluke?
 Why did the Chief Engineer disable comms?
 Every spaceman receives an internals box and ________.
 What brought the space orgy to a grinding halt?
-Scientists are no longer allowed to make  _____.
+Scientists are no longer allowed to make ______.
 What was the clown's best joke?
 The HoP is now hiring assistants for __________.
 What happens when you emag an emag?
-Our gang doesn't wear uniforms. Our gang wears ___________.
 No matter how many lizards you have, _____ is never acceptable.
 No, the AI's second law is NOT to serve _____.
 First CentCom came for the ________. Now they're coming for the __________.
@@ -109,5 +108,12 @@ The auxiliary base was disabled after landing in the middle of _______.
 Xenobiologists have found slimes to be exceptionally responsive to _______.
 Why did the captain give me a medal?
 The curator's new exhibit is devoted solely to _________.
-There's no ______ on the new escape shuttle, but there is plenty of _________!
-What made me sell my soul to the devil?
+What made me sell my soul to the devil?
+The engineers are testing an experimental supermatter setup involving _________.
+I'm __________ in the streets, __________ in the sheets.
+What's my family heirloom?
+The Lawyer was fired for messaging the entire station a picture of ___________.
+On Lavaland, it is rumored that ashwalkers roam, worshipping _________.
+How did the traitor die a glorious death?
+Nanotrasen's new state-of-the-art emergency shuttle was repurposed from _________ and _________.
+What caused my brain trauma?

strings/cas_white.txt

@@ -2,6 +2,7 @@ Those motherfucking carp.
 Having sex in the maintenance tunnels.
 Space 'Nam.
 Space lesbians.
+Space NEETs.
 Space Hitler.
 Space Asshole.
 Ragin' mages.
@@ -57,7 +58,6 @@ Defusing a syndicate bomb with another bomb.
 Going braindead mid-murder.
 A petsplosion.
 Meat spikes.
-Collecting the crew's brains.
 Lopping off the Captain's johnson and shooting it out a pneumatic cannon.
 The secret monkey technique.
 Putting the pAI's doorjack where it don't belong.
@@ -84,7 +84,6 @@ Paranoia.
 Putting the boots to him, medium style.
 ERP-seeking meteors.
 Paperwork HoPs.
-A sexy clown.
 Rampant vending machines.
 The prisoner transfer center.
 Nations.
@@ -186,7 +185,6 @@ A big, black shadowling dick.
 Emagging.
 Dead lizard storage.
 Dermal armor.
-Energy balls.
 Fisting somebody until they gib.
 Alternate uses for defibrillator paddles.
 Breaking spacetime with thousands of bluespace tomatoes.
@@ -197,7 +195,7 @@ Plasmaman strippers.
 A Quartermaster who WON'T STOP ordering guns.
 Space lag.
 Polishing the captain's laser rifle.
-That one asshole double agent.
+That one asshole nuke op.
 A surprise visit from Nanotrasen's CEO.
 The bleeding, dismembered, beautiful corpse of the clown.
 A glass of ...what?
@@ -220,20 +218,18 @@ Welderbombing.
 Validhunting.
 Nar'Sie making love to Lord Singulo.
 Fun.
-Crashing the stock market.
 HONK!
-Enough morphine to put the entire station down.
+Enough morphine to make the entire station comatose.
 A defective comdom.
 Cleanbot.
 A beaker of dried space carp penis.
 An Ian storm.
-voxtest2.
 Nuking it from orbit.
 My senpAI.
 Harmbatonning.
 A Nanotrasen D-Notice.
 TALKING MIMES.
-The lusty xenomorph maid,
+The lusty xenomorph maid.
 Using assistants as human shields.
 Sentient securitrons.
 Piloting the station into the nearest sun.
@@ -247,11 +243,11 @@ Medbay stutterwhores.
 The scrubbers uncontrollably spewing cum.
 The lawyer's job.
 Emoting slowly drawing a gun, then slowly cocking the trigger, then slowly preparing to shoot...
-NAR-SIE HAS RISEN.
+NAR'SIE HAS RISEN.
 Pierrot's Throat.
 A clown bomb.
 Space bees?
-The entire engineering team having unprotected group sex.
+Driving the clown car full speed into the engine.
 IC in OOC.
 The best cookie.
 The wizard with his staff inserted into his anus.
@@ -276,9 +272,8 @@ Draconic.
 Riding borgs, cowgirl style.
 The Voice of God.
 Overpowered stuns.
-Unironically reading library smut.
+Unironically enjoying library smut.
 Spiritual journeys with BZ.
-Freon.
 Deep-fried body parts.
 Suit sensor unit gas chambers.
 Moonlighting.
@@ -294,4 +289,14 @@ Mindswap.
 Potassium in the toilet bowls.
 Giving head to the heads.
 A lizard wearing cat ears.
-DOOR STUCK!!
+Precious clown gold.
+Dabbing on a pile of corpses.
+Tactical chairs.
+The sweet, forbidden meat of the gondola.
+Turning tricks for holocredits.
+A captain that doesn't secure the disk.
+A positive moodlet.
+A sexy clown.
+Razoring the wings off the moths.
+Wiring the ethereals into the powernet. 
+Well-aged miasma.