Merge pull request #13015 from SuperSayu/Holodecker

Holodeck Upgrades [MAP]
This commit is contained in:
Razharas
2015-11-16 04:51:49 +03:00
22 changed files with 1229 additions and 863 deletions
+3
View File
@@ -732,6 +732,7 @@
icon_state = "deck_nanotrasen_full"
w_class = 2
var/cooldown = 0
var/obj/machinery/computer/holodeck/holo = null // Holodeck cards should not be infinite
var/list/cards = list()
/obj/item/toy/cards/deck/New()
@@ -769,6 +770,8 @@
user << "<span class='warning'>There are no more cards to draw!</span>"
return
var/obj/item/toy/cards/singlecard/H = new/obj/item/toy/cards/singlecard(user.loc)
if(holo)
holo.spawned += H // track them leaving the holodeck
choice = cards[1]
H.cardname = choice
H.parentdeck = src