Combined main code changes from Polaris.

Author: MistakeNot4892

code/__defines/machinery.dm

@@ -42,28 +42,27 @@ var/global/defer_powernet_rebuild = 0      // True if net rebuild will be called
 
 // Camera channels
 // Station channels
-#define CAMERA_CHANNEL_PUBLIC "Public"
-#define CAMERA_CHANNEL_ENGINEERING "Engineering"
-#define CAMERA_CHANNEL_MEDICAL "Medical"
-#define CAMERA_CHANNEL_RESEARCH "Research"
-#define CAMERA_CHANNEL_SECURITY "Security"
-
-#define CAMERA_CHANNEL_ROBOTS "Robots"
-#define CAMERA_CHANNEL_MINE "Mining"
-#define CAMERA_CHANNEL_SECRET "Secret"
+#define CAMERA_CHANNEL_PUBLIC              "Public"
+#define CAMERA_CHANNEL_ENGINEERING         "Engineering"
+#define CAMERA_CHANNEL_MEDICAL             "Medical"
+#define CAMERA_CHANNEL_RESEARCH            "Research"
+#define CAMERA_CHANNEL_SECURITY            "Security"
+#define CAMERA_CHANNEL_ROBOTS              "Robots"
+#define CAMERA_CHANNEL_MINE                "Mining"
+#define CAMERA_CHANNEL_SECRET              "Secret"
 
 // Non-station channels
-#define CAMERA_CHANNEL_CRESCENT "Crescent"
-#define CAMERA_CHANNEL_ERT "ZeEmergencyResponseTeam"
-#define CAMERA_CHANNEL_MERCENARY "MercurialNet"
-#define CAMERA_CHANNEL_TELEVISION "Television"
+#define CAMERA_CHANNEL_CRESCENT            "Crescent"
+#define CAMERA_CHANNEL_ERT                 "Emergency Response Team"
+#define CAMERA_CHANNEL_MERCENARY           "MercurialNet"
+#define CAMERA_CHANNEL_TELEVISION          "Television"
 
 // Alarm networks
-#define NETWORK_ALARM_ATMOS "Atmosphere Alarms"
+#define NETWORK_ALARM_ATMOS  "Atmosphere Alarms"
 #define NETWORK_ALARM_CAMERA "Camera Alarms"
-#define NETWORK_ALARM_FIRE "Fire Alarms"
+#define NETWORK_ALARM_FIRE   "Fire Alarms"
 #define NETWORK_ALARM_MOTION "Motion Alarms"
-#define NETWORK_ALARM_POWER "Power Alarms"
+#define NETWORK_ALARM_POWER  "Power Alarms"
 
 //singularity defines
 #define STAGE_ONE 	1

code/datums/outfits/outfit.dm

@@ -270,3 +270,7 @@
 
 /decl/outfit/dd_SortValue()
 	return name
+
+// Stub for the sake of being able to make people spawn nude.
+/decl/outfit/naked
+	name = "Naked And Afraid"

code/datums/storage/subtypes_box.dm

@@ -18,6 +18,9 @@
 /datum/storage/box/animal_cube
 	can_hold = list(/obj/item/food/animal_cube)
 
+/datum/storage/box/large/metal
+	use_sound = 'sound/effects/closet_open.ogg'
+
 /datum/storage/box/snappop
 	can_hold = list(/obj/item/toy/snappop)
 

code/game/machinery/cryopod.dm

@@ -576,4 +576,4 @@
 	return TRUE
 
 /obj/machinery/cryopod/proc/on_mob_spawn()
-	playsound(src, 'sound/machines/ding.ogg', 30, 1)
+	playsound(src, 'sound/machines/ding.ogg', 30, 1)

code/game/machinery/holosign.dm

@@ -10,8 +10,9 @@
 	anchored = TRUE
 	obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
 	directional_offset = @'{"NORTH":{"y":-32}, "SOUTH":{"y":32}, "EAST":{"x":32}, "WEST":{"x":-32}}'
-	var/lit = 0
+	var/lit = FALSE
 	var/on_icon = "sign_on"
+	var/sign_light_color = COLOR_CYAN_BLUE
 
 	uncreated_component_parts = list(
 		/obj/item/stock_parts/radio/receiver,
@@ -33,11 +34,11 @@
 
 /obj/machinery/holosign/on_update_icon()
 	if (!lit || inoperable())
-		icon_state = "sign_off"
+		icon_state = initial(icon_state)
 		set_light(0)
 	else
 		icon_state = on_icon
-		set_light(1, 0.5, COLOR_CYAN_BLUE)
+		set_light(1, 0.5, sign_light_color)
 
 /decl/public_access/public_variable/holosign_on
 	expected_type = /obj/machinery/holosign
@@ -68,6 +69,13 @@
 	desc = "Small wall-mounted holographic projector. This one reads SERVICE."
 	on_icon = "service"
 
+/obj/machinery/holosign/bar
+	name = "bar holosign"
+	desc = "Small wall-mounted holographic projector. This one reads OPEN."
+	icon_state = "barclosed"
+	on_icon = "baropen"
+	sign_light_color = COLOR_LIGHT_CYAN
+
 ////////////////////SWITCH///////////////////////////////////////
 /obj/machinery/button/holosign
 	name = "holosign switch"

code/game/machinery/oxygen_pump.dm

@@ -280,4 +280,4 @@
 		if(lungs.is_bruised() && prob(30))
 			lungs.heal_damage(1)
 		else
-			breather.suffocation_counter = max(breather.suffocation_counter - rand(1,5), 0)
+			breather.suffocation_counter = max(breather.suffocation_counter - rand(1,5), 0)

code/game/movietitles.dm

@@ -128,7 +128,7 @@ var/global/list/end_titles
 		titles += "<center>STAFF'S GOOD BOYS:<br>[english_list(goodboys)]</center><br>"
 
 	var/disclaimer = "<br>Sponsored by [global.using_map.company_name].<br>All rights reserved.<br>\
-					 This motion picture is protected under the copyright laws of the Sol Central Government<br> and other nations throughout the galaxy.<br>\
+					 This motion picture is protected under the copyright laws of the system government<br> and other nations throughout the galaxy.<br>\
 					 Colony of First Publication: [pick("Mars", "Luna", "Earth", "Venus", "Phobos", "Ceres", "Tiamat", "Ceti Epsilon", "Eos", "Pluto", "Ouere",\
 					 "Lordania", "Kingston", "Cinu", "Yuklid V", "Lorriman", "Tersten", "Gaia")].<br>"
 	disclaimer += pick("Use for parody prohibited. PROHIBITED.",
@@ -146,4 +146,4 @@ var/global/list/end_titles
 	titles += "<hr>"
 	titles += "<center><span style='font-size:6pt;'>[JOINTEXT(disclaimer)]</span></center>"
 
-	return titles
+	return titles

code/game/objects/items/circuitboards/computer/computer.dm

@@ -120,4 +120,4 @@
 
 /obj/item/stock_parts/circuitboard/guestpass
 	name = "circuitboard (guest pass terminal)"
-	build_path = /obj/machinery/computer/guestpass
+	build_path = /obj/machinery/computer/guestpass

code/game/objects/items/devices/gps.dm

@@ -453,3 +453,16 @@ var/global/list/all_gps_units = list()
 		"stripe-outside" = "#ffae00",
 		"stripe-inside" =  "#9e7900"
 	)
+
+/obj/item/gps/security
+	color = "#5c0000"
+	decals = list(
+		"stripe-outside" = "#ff0000",
+		"stripe-inside" =  "#800000"
+	)
+
+/obj/item/gps/security/hos
+	decals = list(
+		"stripe-outside" = "#ffae00",
+		"stripe-inside" =  "#9e7900"
+	)

code/game/objects/items/weapons/material/ashtray.dm

@@ -58,3 +58,6 @@
 
 /obj/item/ashtray/glass
 	material = /decl/material/solid/glass
+
+/obj/item/ashtray/bronze
+	material = /decl/material/solid/metal/bronze