Merge pull request #1449 from Yawn-Wider/shadekin-area

Shadekin phase shielding areas, ticket printers sec

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

@@ -972,6 +972,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Command - Site Manager's Office"
 	icon_state = "captain"
 	sound_env = MEDIUM_SOFTFLOOR
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to site manager's office
 
 /area/crew_quarters/heads/hop
 	name = "\improper Command - HoP's Office"
@@ -1756,6 +1757,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/security/brig
 	name = "\improper Security - Brig"
 	icon_state = "brig"
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to brig
 
 /area/security/brig/prison_break()
 	for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
@@ -1768,6 +1770,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/security/prison
 	name = "\improper Security - Prison Wing"
 	icon_state = "sec_prison"
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to brig
 
 /area/security/prison/prison_break()
 	for(var/obj/structure/closet/secure_closet/brig/temp_closet in src)
@@ -1785,6 +1788,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Security - Armory"
 	icon_state = "armory"
 	ambience = AMBIENCE_HIGHSEC
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to armoury
 
 /area/security/briefing_room
 	name = "\improper Security - Briefing Room"
@@ -1814,6 +1818,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/security/range
 	name = "\improper Security - Firing Range"
 	icon_state = "firingrange"
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to perma
 
 /area/security/security_aid_station
 	name = "\improper Security - Security Aid Station"
@@ -1844,7 +1849,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Security - Tactical Equipment"
 	icon_state = "Tactical"
 	ambience = AMBIENCE_HIGHSEC
-
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to tactical
 
 /*
 	New()
@@ -1867,6 +1872,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Vault"
 	icon_state = "nuke_storage"
 	ambience = AMBIENCE_HIGHSEC
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to vault
 
 /area/security/checkpoint
 	name = "\improper Security Checkpoint"
@@ -2334,12 +2340,14 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper AI Upload Chamber"
 	icon_state = "ai_upload"
 	ambience = AMBIENCE_AI
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to ai upload
 
 /area/ai_upload_foyer
 	name = "AI Upload Access"
 	icon_state = "ai_foyer"
 	sound_env = SMALL_ENCLOSED
 	ambience = AMBIENCE_AI
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to ai upload
 
 /area/ai_server_room
 	name = "Messaging Server Room"
@@ -2351,6 +2359,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper AI Chamber"
 	icon_state = "ai_chamber"
 	ambience = AMBIENCE_AI
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to ai chamber
 
 /area/ai_cyborg_station
 	name = "\improper Cyborg Station"
@@ -2437,6 +2446,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 // Telecommunications Satellite
 /area/tcommsat/
 	ambience = AMBIENCE_ENGINEERING
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to tcoms
 
 /area/tcommsat/entrance
 	name = "\improper Telecomms Teleporter"
@@ -2455,6 +2465,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	name = "\improper Telecomms Foyer"
 	icon_state = "tcomsatfoyer"
 	ambience = AMBIENCE_ENGINEERING
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to tcoms
 
 /area/tcomwest
 	name = "\improper Telecommunications Satellite West Wing"

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

@@ -172,6 +172,7 @@
 /area/security/perma
 	name = "\improper Prison"
 	icon_state = "security"
+	flags = PHASE_SHIELDED
 
 /area/security/perma/bathroom
 	name = "\improper Prison Bathroom"

maps/yw/cryogaia-05-main.dmm

@@ -24940,6 +24940,11 @@
 /obj/item/device/holowarrant,
 /obj/item/device/holowarrant,
 /obj/item/device/holowarrant,
+/obj/item/device/ticket_printer,
+/obj/item/device/ticket_printer,
+/obj/item/device/ticket_printer,
+/obj/item/device/ticket_printer,
+/obj/item/device/ticket_printer,
 /turf/simulated/floor/tiled/steel,
 /area/security/security_lockerroom)
 "jEM" = (

maps/yw/cryogaia_areas.dm

@@ -1,69 +1,69 @@
 //Overrides
 /area/crew_quarters/sleep/Dorm_1
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_2
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_3
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_4
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_5
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_6
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_7
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_8
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_9
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
 	block_tracking = TRUE
 
 /area/crew_quarters/sleep/Dorm_10
-	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED
+	flags = RAD_SHIELDED | BLUE_SHIELDED | TEMPERATURE_SHIELDED | PHASE_SHIELDED
 	soundproofed = TRUE
 	limit_mob_size = FALSE
 	block_suit_sensors = TRUE
@@ -504,9 +504,11 @@
 /area/security/brig/visitation
 	name = "\improper Visitation"
 	icon_state = "security"
+	flags = PHASE_SHIELDED
 /area/security/brig/bathroom
 	name = "\improper Brig Bathroom"
 	icon_state = "security"
+	flags = PHASE_SHIELDED
 /area/security/armory/blue
 	name = "\improper Armory - Blue"
 	icon_state = "armory"
@@ -545,6 +547,7 @@
 /area/security/sorting
 	name = "\improper Security disposals processing"
 	icon_state = "security"
+	flags = PHASE_SHIELDED // YW Addition adds phase shielding to tcoms
 
 /area/maintenance/security
 	name = "Security Maintenance"