Merge pull request #1016 from Shadowfire117/ChristmasCasino

So this is Christmas...

code/game/area/Space Station 13 areas_ch.dm

@@ -2,7 +2,7 @@
 	name = "\improper Casino Ship"
 	icon_state = "yellow"
 	requires_power = 0
-	dynamic_lighting = 0
+	dynamic_lighting = 1
 
 /area/casino/casino_ship/wing_left
 	name = "\improper Casino Ship left wing"
@@ -24,25 +24,25 @@
 	name = "\improper Casino Shuttle"
 	dynamic_lighting = 0
 	icon_state = "shuttlegrn"
-	
+
 /area/surface/outpost/main/dorms
 	name = "\improper Main Outpost Dorms"
-  
+
 /area/surface/outpost/main/dorms/dorm_1
 	name = "\improper Main Outpost Dorm One"
-  
+
 /area/surface/outpost/main/dorms/dorm_2
 	name = "\improper Main Outpost Dorm Two"
-  
+
 /area/surface/outpost/main/dorms/dorm_3
 	name = "\improper Main Outpost Dorm Three"
-  
+
 /area/surface/outpost/main/dorms/dorm_4
 	name = "\improper Main Outpost Dorm Four"
-  
+
 /area/surface/outpost/main/dorms/dorm_5
 	name = "\improper Main Outpost Dorm Five"
-  
+
 /area/surface/outpost/main/dorms/dorm_6
 	name = "\improper Main Outpost Dorm Six"
 

code/game/machinery/casino_prize_dispenser_ch.dm

@@ -277,7 +277,7 @@
 				var/obj/item/weapon/spacecasinocash/cash = usr.get_active_hand()
 				paid = pay_with_chips(cash, usr, price)
 			else
-				to_chat(usr, "<span class='warning'>Payment failure: Improper payment method.</span>")
+				to_chat(usr, "<span class='warning'>Payment failure: Improper payment method, please provide chips.</span>")
 				return TRUE // we set this because they shouldn't even be able to get this far, and we want the UI to update.
 			if(paid)
 				if(item_given == TRUE)

code/game/machinery/event/christmas_ch.dm

@@ -0,0 +1,16 @@
+/obj/structure/event/present
+	name = "decorative present"
+	desc = "A gift! What cou- oh, it's made of plastic.."
+	icon = 'icons/obj/items_ch.dmi'
+	icon_state = "gift1_g"
+
+	var/chaos = "I can do anything!"
+	anchored = 1.0
+	density = 0
+
+/obj/structure/event/present/New()
+	..()
+	pixel_x = rand(-10,10)
+	pixel_y = rand(-10,10)
+	icon_state = "gift[pick("1", "2", "3")]_[pick("g", "r", "b", "y", "p")]"
+	return

code/game/objects/effects/effect_system_ch.dm

@@ -62,4 +62,27 @@
 				step(confetti,direction)
 			spawn(confetti.time_to_live*0.75+rand(10,30))
 				if (confetti) qdel(confetti)
-				src.total_confetti--
+				src.total_confetti--
+
+/////////////////////////////////////////////
+// Snow fall
+// Permanent mood snow
+/////////////////////////////////////////////
+
+/obj/effect/effect/snow
+	name = "light snowfall"
+	icon = 'icons/effects/weather.dmi'
+	icon_state = "snowfall_light"
+
+	layer = 4.2
+	opacity = 0
+	anchored = 0.0
+	mouse_opacity = 0
+
+/obj/effect/effect/snow/medium
+	name = "medium snowfall"
+	icon_state = "snowfall_med"
+
+/obj/effect/effect/snow/heavy
+	name = "heavy snowfall"
+	icon_state = "snowfall_heavy"

code/game/objects/items/weapons/gift_wrappaper_ch.dm

@@ -0,0 +1,81 @@
+
+// Chomp gift, randomized color and size, wider selection of items to obtain, also chance of chaos present with even wilder stuff
+
+
+/obj/item/weapon/a_gift/advanced
+	name = "present"
+	desc = "A gift! What could be inside?!"
+	icon = 'icons/obj/items_ch.dmi'
+	icon_state = "gift1_g"
+	item_state = "gift1_g"
+	var/chaos = "I can do anything!"
+
+/obj/item/weapon/a_gift/advanced/New()
+	..()
+	pixel_x = rand(-10,10)
+	pixel_y = rand(-10,10)
+
+	chaos = rand(1, 100)
+	if(chaos == 1)
+		icon_state = "gift_chaos"
+		chaos = TRUE
+	else
+		icon_state = "gift[pick("1", "2", "3")]_[pick("g", "r", "b", "y", "p")]"
+		chaos = FALSE
+
+	item_state = icon_state
+	return
+
+/obj/item/weapon/a_gift/advanced/attack_self(mob/M as mob) //WIP - add more items to list! - Jack
+	var/gift_type = pick(
+		/obj/item/weapon/storage/wallet,
+		/obj/item/weapon/storage/photo_album,
+		/obj/item/weapon/storage/box/snappops,
+		/obj/item/weapon/storage/fancy/crayons,
+		/obj/item/weapon/storage/backpack/holding,
+		/obj/item/weapon/storage/belt/champion,
+		/obj/item/weapon/soap/deluxe,
+		/obj/item/weapon/pickaxe/silver,
+		/obj/item/weapon/pen/invisible,
+		/obj/item/weapon/lipstick/random,
+		/obj/item/weapon/grenade/smokebomb,
+		/obj/item/weapon/corncob,
+		/obj/item/weapon/contraband/poster,
+		/obj/item/weapon/book/manual/barman_recipes,
+		/obj/item/weapon/book/manual/chef_recipes,
+		/obj/item/weapon/bikehorn,
+		/obj/item/weapon/beach_ball,
+		/obj/item/weapon/beach_ball/holoball,
+		/obj/item/toy/balloon,
+		/obj/item/toy/blink,
+		/obj/item/toy/crossbow,
+		/obj/item/weapon/gun/projectile/revolver/capgun,
+		/obj/item/toy/katana,
+		/obj/item/toy/mecha/deathripley,
+		/obj/item/toy/mecha/durand,
+		/obj/item/toy/mecha/fireripley,
+		/obj/item/toy/mecha/gygax,
+		/obj/item/toy/mecha/honk,
+		/obj/item/toy/mecha/marauder,
+		/obj/item/toy/mecha/mauler,
+		/obj/item/toy/mecha/odysseus,
+		/obj/item/toy/mecha/phazon,
+		/obj/item/toy/mecha/ripley,
+		/obj/item/toy/mecha/seraph,
+		/obj/item/toy/spinningtoy,
+		/obj/item/toy/sword,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiadeus,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris,
+		/obj/item/device/paicard,
+		/obj/item/device/instrument/violin,
+		/obj/item/weapon/storage/belt/utility/full,
+		/obj/item/clothing/accessory/tie/horrible)
+
+	if(!ispath(gift_type,/obj/item))	return
+
+	var/obj/item/I = new gift_type(M)
+	M.remove_from_mob(src)
+	M.put_in_hands(I)
+	I.add_fingerprint(M)
+	qdel(src)
+	return

code/game/objects/items/weapons/id cards/CH_ids.dm

@@ -1,26 +1,36 @@
 /obj/item/weapon/card/id/casino
-	name = "casino employee id"
+	name = "casino id"
 	desc = "An ID card for an employee of the golden goose casino."
 	icon_state = "ch_casino"
 	item_state = "gold_id"
 
 	access = list(160)
 
-/obj/item/weapon/card/id/casino/booth
-	name = "casino booth employee id"
-	desc = "An ID card for an employee of the golden goose casino with extra access to prize booth."
+/obj/item/weapon/card/id/casino/both
+	name = "casino both id"
+	desc = "An ID card for an employee of the golden goose casino with extra access to prize both."
 	access = list(160, 200)
 
-/obj/item/weapon/card/id/casino
-	name = "casino employee id"
-	desc = "An ID card for an employee of the golden goose casino."
-	icon_state = "ch_casino"
-	item_state = "gold_id"
+/obj/item/weapon/card/id/casino/medical
+	name = "casino medical id"
+	desc = "An ID card for an employee of the golden goose casino that oversees medical care."
+	icon_state = "ch_casino_med"
+	access = list(160, 202)
 
-	access = list(160, 200, 201)
+/obj/item/weapon/card/id/casino/engineering
+	name = "casino engineering id"
+	desc = "An ID card for an employee of the golden goose casino that oversees maintenance."
+	icon_state = "ch_casino_eng"
+	access = list(160, 203)
+
+/obj/item/weapon/card/id/casino/security
+	name = "casino security id"
+	desc = "An ID card for an employee of the golden goose casino that oversees security."
+	icon_state = "ch_casino_sec"
+	access = list(160, 200, 201, 202, 203)
 
 /obj/item/weapon/card/id/casino/manager
 	name = "casino manager id"
-	desc = "An ID card for the manager of the golden goose casino."
+	desc = "An ID card for the manager of the golden goose casino, fancy!"
 	icon_state = "ch_casino_manager"
-	access = list(160, 200, 201, 300)
+	access = list(160, 200, 201, 202, 203, 300)

code/modules/shuttles/shuttles_ch.dm

@@ -1,5 +0,0 @@
-
-/obj/machinery/computer/shuttle_control/multi/casino
-	name = "casino shuttle control console"
-	req_access = list(access_trader)
-	shuttle_tag = "Casino Ferry"

maps/southern_cross/southern_cross.dm

@@ -48,7 +48,7 @@
 	#include "southern_cross-9.dmm"
 	#include "southern_cross-10.dmm"
 	//CHOMPStation Edit End
-	#include "southern_cross-casino.dmm" //CHOMP By default is enabled cause shuttle wont connect with docks if loaded mid round - Jack :Temporarily disabled to save space - Raz
+	#include "southern_cross-casino.dmm" //CHOMPedit: Disabled to save resources and loaded in during events - Jack
 
 	#include "submaps/_southern_cross_submaps.dm"
 

maps/southern_cross/southern_cross_defines.dm

@@ -10,7 +10,8 @@
 #define Z_LEVEL_CENTCOM					7
 #define Z_LEVEL_TRANSIT					8
 #define Z_LEVEL_SURFACE_WILD			9
-#define Z_LEVEL_GATEWAY					10
+#define Z_LEVEL_GATEWAY					11  //CHOMPedit - KSC = changed 10-11 so weather works on casino.
+#define Z_LEVEL_SURFACE_CASINO			10	//CHOMPedit - KSC = So there is weather on the casino.
 
 /datum/map/southern_cross
 	name = "Southern Cross"
@@ -223,6 +224,13 @@
 	flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES
 	base_turf = /turf/simulated/floor/outdoors/rocks
 
+//CHOMPedit - KSC = So Christmas Casino has weather.
+/datum/map_z_level/southern_cross/surface_casino
+	z = Z_LEVEL_SURFACE_CASINO
+	name = "Casino"
+	flags = MAP_LEVEL_PLAYER|MAP_LEVEL_SEALED|MAP_LEVEL_CONTACT|MAP_LEVEL_CONSOLES
+	base_turf = /turf/simulated/floor/outdoors/rocks
+
 /datum/map_z_level/southern_cross/misc
 	z = Z_LEVEL_MISC
 	name = "Misc"
@@ -274,7 +282,8 @@
 	expected_z_levels = list(
 		Z_LEVEL_SURFACE,
 		Z_LEVEL_SURFACE_MINE,
-		Z_LEVEL_SURFACE_WILD
+		Z_LEVEL_SURFACE_WILD,
+		Z_LEVEL_SURFACE_CASINO //CHOMPedit - KSC = So there is weather on the Casino.
 	)
 
 /obj/effect/step_trigger/teleporter/bridge/east_to_west/Initialize()

maps/southern_cross/southern_cross_shuttles_ch.dm

@@ -1,39 +1,4 @@
 
-//Casino
-/datum/shuttle/autodock/multi/casino
-	name = "Casino Ferry"
-	current_location = "casino_ship"
-	warmup_time = 10
-	shuttle_area = /area/shuttle/casino
-	docking_controller_tag = "casino_shuttle"
-	destination_tags = list(
-		"casino_ship",
-		"d1_aux_b",
-		"d1_aux_c",
-		"d2_w1_e",
-		"d2_w2_e",
-		"d2_w3_e"
-	)
-	announcer = "Automated Traffic Control"
-	arrival_message = "Attention. The Casino Ferry has docked with the station."
-	departure_message = "Attention. The Casino Ferry has departed from the station."
-	move_direction = WEST
-
-/obj/effect/shuttle_landmark/southern_cross/casino_offsite
-	name = "Casino Ship"
-	landmark_tag = "casino_ship"
-	docking_controller = "casino_shuttle_bay"
-	base_area = /area/space
-	base_turf = /turf/space
-	shuttle_restricted = "Casino Ferry"
-
-/*
-/obj/effect/shuttle_landmark/southern_cross/casino_station
-	name = "Casino Station"
-	landmark_tag = "casino_station"
-	docking_controller = "casino_shuttle_dock_airlock"
-*/
-
 //Exploration carrier
 /obj/machinery/computer/shuttle_control/exploration
 	name = "Exploration Sling Control Console"

vorestation.dme

@@ -957,6 +957,7 @@
 #include "code\game\machinery\embedded_controller\embedded_program_base.dm"
 #include "code\game\machinery\embedded_controller\mapping_helpers.dm"
 #include "code\game\machinery\embedded_controller\simple_docking_controller.dm"
+#include "code\game\machinery\event\christmas_ch.dm"
 #include "code\game\machinery\event\stage_vr.dm"
 #include "code\game\machinery\pipe\construction.dm"
 #include "code\game\machinery\pipe\pipe_dispenser.dm"
@@ -1281,6 +1282,7 @@
 #include "code\game\objects\items\weapons\extinguisher.dm"
 #include "code\game\objects\items\weapons\flamethrower.dm"
 #include "code\game\objects\items\weapons\gift_wrappaper.dm"
+#include "code\game\objects\items\weapons\gift_wrappaper_ch.dm"
 #include "code\game\objects\items\weapons\handcuffs.dm"
 #include "code\game\objects\items\weapons\handcuffs_vr.dm"
 #include "code\game\objects\items\weapons\improvised_components.dm"
@@ -3761,7 +3763,6 @@
 #include "code\modules\shuttles\shuttle_ferry.dm"
 #include "code\modules\shuttles\shuttle_specops.dm"
 #include "code\modules\shuttles\shuttle_supply.dm"
-#include "code\modules\shuttles\shuttles_ch.dm"
 #include "code\modules\shuttles\shuttles_multi.dm"
 #include "code\modules\shuttles\shuttles_vr.dm"
 #include "code\modules\shuttles\shuttles_web.dm"