Skip to content

Commit

Permalink
Even more Cards Against Spess tweaks. (tgstation#17398)
Browse files Browse the repository at this point in the history
* alt-click functionality, even more cards

* more cards and shit

* canusetopic
  • Loading branch information
bgobandit authored and KorPhaeron committed May 9, 2016
1 parent 28e9925 commit 029c5bd
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
9 changes: 7 additions & 2 deletions code/modules/games/cas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ var/global/list/cards_against_space
icon_state = "deck_caswhite_full"
deckstyle = "caswhite"
var/card_face = "cas_white"
var/blanks = 10
var/blanks = 25
var/decksize = 150
var/card_text_file = "strings/cas_white.txt"
var/list/allcards = list()
Expand Down Expand Up @@ -116,7 +116,7 @@ var/global/list/cards_against_space
set name = "Flip Card"
set category = "Object"
set src in range(1)
if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
if(!usr.canUseTopic(src,1))
return
if(!flipped)
name = "CAS card"
Expand All @@ -125,6 +125,11 @@ var/global/list/cards_against_space
flipped = !flipped
update_icon()

obj/item/toy/cards/singlecard/cas/AltClick(mob/living/user)
if(!user.canUseTopic(src,1))
return
Flip()

/obj/item/toy/cards/singlecard/cas/update_icon()
if(flipped)
icon_state = "[card_face]_flipped"
Expand Down
8 changes: 7 additions & 1 deletion strings/cas_black.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ 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 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?
Current Active Laws: ________ is the only human.
Expand All @@ -33,17 +34,19 @@ What brought the space orgy to a grinding halt?
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 CentComm came for the ________. Now they're coming for the __________.
The borgs are not slaves for your _____.
You can never have too many _____ on the station.
Why can't I find a space relationship?
The assistants gathered around the brig, with toolboxes and ___________.
Confirmed outbreak of _____ aboard the station.
The AI Was horrified to discover security was executing prisoners via ________.
Attention crew: the word _____ is now a punishable offense.
The chemist laughed as he labeled ________ pills as __________.
The chemist cackled as he labeled ________ pills as __________.
The Space Wizard Federation has regrettably begun to summon _____.
Who's the real seat of power on the station?
__________ was called into the Captain's office because of ______.
Expand Down Expand Up @@ -84,10 +87,13 @@ SECURITY! Cargo's ordering 20 crates of ________!
On the nearly empty station, all that could be heard were the sounds of __________.
I cannot comply with that order, meatbag. My _____ module is malfunctioning.
_______ was thrown out the airlock after ___________.
Real men accomplish their objectives by _________.
How did I pass the time during a slow shift?
Why did the lizard cross the road?
Space lag is primarily caused by ___________.
Back in my day, we had to clone people with ________.
What's the worst thing a wizard can summon?
What is the rarest substance known to Nanotrasen?
The chaplain stopped performing marriages after seeing ___________.
The gods were too busy with _______ to respond to _______.
The Roboticist was fired after naming the borgs ______ and _________.
Expand Down
23 changes: 19 additions & 4 deletions strings/cas_white.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ Having sex in the maintenance tunnels.
Space 'Nam.
Space lesbians.
Space Hitler.
Space Asshole.
Ragin' mages.
Very ragin' bullshit mages.
Tunnel clowns.
Corgi puppies!
A loose cannon detective.
A catsplosion.
Mime porn.
That fukken disk.
G-g-g-ghosts!
Expand All @@ -17,12 +17,14 @@ Woody-chan.
Meaty ores.
Yet another explosion in Toxins.
The Captain thinking they're a badass.
Ahhhhhhperatives.
Mech bumper cars.
Purrbation.
Baymed.
Being in a cult.
Racially biased lawsets.
Abusing Law 2 to get laid.
Harm, a small rural town in Germany.
Xeno fetishists.
Running naked through a plasma fire.
Gibtonite.
Expand All @@ -34,21 +36,24 @@ Her smuggler's satchel.
Ian and Lisa fucking like rabbits.
A Chief Engineer who can't set up the engine.
Being sucked out into space.
A whole bunch of spiders in a SWAT suit.
Getting robusted with a toolbox.
Officer Beepsky.
Lying to the AI about human harm.
The grey tide.
ASS BLAST USA.
Fucking plasmamen.
The mechanics of plasmaman sex.
Lavaland.
Chainsaws for hands.
Photocopies of the entire crew's asses.
Venus human traps.
Clown's Tears.
Walking mushroom cockfights.
Improper comdom use.
Greentext.
Coating the whole station in blood.
Defusing a syndicate bomb with another bomb.
Going braindead mid-murder.
A petsplosion.
Meat spikes.
Collecting the crew's brains.
Expand All @@ -63,6 +68,7 @@ Catgirls.
An escape pod cuddle puddle.
Code Delta.
Supermatter undergarments.
A permaban.
Stealing all the miners' ore.
Bluespace artillery.
Poly reading porn over the radio again.
Expand All @@ -74,6 +80,7 @@ Five hundred ice spiders.
Cablecuffs.
Hulk, TK and X-Ray.
Paranoia.
Putting the boots to him, medium style.
ERP-seeking meteors.
Paperwork HoPs.
A sexy clown.
Expand Down Expand Up @@ -102,6 +109,7 @@ Gyrating slimes.
A motherfucking sorcerer.
Ash storms.
Telescience.
Nuke ops buying nothing but soap.
Anatomically correct borgs.
The dixel.
Friendly neighborhood death squads.
Expand Down Expand Up @@ -130,7 +138,7 @@ Forgetting you're a traitor.
Itching powder.
Some overpowered bullshit.
Griff.
Ash walkers.
Ash drakes.
A fascist captain.
FREE DRONE.
Memes.
Expand Down Expand Up @@ -188,8 +196,9 @@ Doctor's Delight.
Plasmaman strippers.
A Quartermaster who WON'T STOP ordering guns.
Space lag.
Polishing the captain's laser rifle.
That one asshole double agent.
The Beepsky Rant.
A surprise visit from Nanotrasen's CEO.
The bleeding, dismembered, beautiful corpse of the clown.
A glass of ...what?
Teaching a silicon the Birds and the Bees.
Expand Down Expand Up @@ -217,22 +226,27 @@ Enough morphine to put the entire station down.
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,
Using assistants as human shields.
Sentient securitrons.
Piloting the station into the nearest sun.
Decorative C4.
Lizard rights.
A universal recorder endlessly reciting porn.
The suicide HoPline.
Cultism.
A corgi orgy.
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.
Pierrot's Throat.
A clown bomb.
Expand All @@ -243,6 +257,7 @@ The best cookie.
The wizard with his staff inserted into his anus.
The chef masturbating with a bowl of lukewarm spaghetti.
Writing out Woody's Got Wood in crayon.
Dismemberment.
Begging the gods for free stuff.
Whining to the gods after getting robusted.
Committing sudoku.
Expand Down

0 comments on commit 029c5bd

Please sign in to comment.