Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate

All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>

code/modules/games/cards.dm

@@ -348,11 +348,11 @@
 	user.visible_message("<span class = 'notice'>\The [user] [concealed ? "conceals" : "reveals"] their hand.</span>")
 
 /obj/item/weapon/hand/examine(mob/user)
-	..(user)
+	. = ..()
 	if((!concealed) && cards.len)
-		to_chat(user,"It contains: ")
+		. += "It contains: "
 		for(var/datum/playingcard/P in cards)
-			to_chat(user,"\The [P.name].")
+			. += "\The [P.name]."
 
 /obj/item/weapon/hand/verb/Removecard()
 

code/modules/games/spaceball_cards.dm

@@ -8,7 +8,7 @@
 	..()
 	var/datum/playingcard/P
 	var/i
-	var/year = 554 + text2num(time2text(world.timeofday, "YYYY"))
+	var/year = 300 + text2num(time2text(world.timeofday, "YYYY")) //VOREStation Edit
 	for(i=0;i<5;i++)
 		P = new()
 		if(prob(1))