Cargo Console can consume caps + Communications Console adjustments

code/game/machinery/computer/communications.dm

@@ -73,7 +73,7 @@
 				if(check_access(I))
 					authenticated = 1
 					auth_id = "[I.registered_name] ([I.assignment])"
-					if((ACCESS_CAPTAIN in I.access))
+					if((ACCESS_NCR_COMMAND in I.access))
 						authenticated = 2
 					playsound(src, 'sound/machines/terminal_on.ogg', 50, FALSE)
 				if(obj_flags & EMAGGED)
@@ -245,16 +245,16 @@
 						currmsg.answer_callback.InvokeAsync()
 				state = STATE_VIEWMESSAGE
 				updateDialog()
-//		if("status")
-//			state = STATE_STATUSDISPLAY
+		if("status")
+			state = STATE_STATUSDISPLAY
 		if("securitylevel")
 			tmp_alertlevel = text2num( href_list["newalertlevel"] )
 			if(!tmp_alertlevel)
 				tmp_alertlevel = 0
 			state = STATE_CONFIRM_LEVEL
 		if("changeseclevel")
 			state = STATE_ALERT_LEVEL
-/*
+
 		if("emergencyaccess")
 			state = STATE_TOGGLE_EMERGENCY
 		if("enableemergency")
@@ -287,7 +287,7 @@
 		if("setmsg2")
 			stat_msg2 = reject_bad_text(input("Line 2", "Enter Message Text", stat_msg2) as text|null, 40)
 			updateDialog()
-*/
+
 /*		// OMG CENTCOM LETTERHEAD
 		if("MessageCentCom")
 			if(authenticated)
@@ -492,11 +492,12 @@
 				dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=logout'>Log Out</A> \]<BR>"
 				dat += "<BR><B>General Functions</B>"
 				dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=messagelist'>Message List</A> \]"
-				switch(SSshuttle.emergency.mode)
+				/*switch(SSshuttle.emergency.mode)
 					if(SHUTTLE_IDLE, SHUTTLE_RECALL)
 						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=callshuttle'>Call transit</A> \]"
 					else
 						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=cancelshuttle'>Cancel transit Call</A> \]"
+				*/
 
 				dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=status'>Set Status Display</A> \]"
 				if (authenticated==2)
@@ -511,16 +512,16 @@
 							dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=crossserver=all;cross_dest=[server]'>Send a message to station in [server] sector.</A> \]"
 						if(cross_servers.len > 2)
 							dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=crossserver;cross_dest=all'>Send a message to all allied stations</A> \]"
-					if(SSmapping.config.allow_custom_shuttles)
-						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=purchase_menu'>Purchase Shuttle</A> \]"
+					/*if(SSmapping.config.allow_custom_shuttles)
+						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=purchase_menu'>Purchase Shuttle</A> \]"*/
 					dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=changeseclevel'>Change Alert Level</A> \]"
 					dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=emergencyaccess'>Emergency Maintenance Access</A> \]"
-					dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"
-					if(!(obj_flags & EMAGGED))
-						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=MessageCentCom'>Send Message to CentCom</A> \]"
-					else
-						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=MessageSyndicate'>Send Message to \[UNKNOWN\]</A> \]"
-						dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=RestoreBackup'>Restore Backup Routing Data</A> \]"
+					//dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"
+					//if(!(obj_flags & EMAGGED))
+					//	dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=MessageCentCom'>Send Message to CentCom</A> \]"
+					//else
+					//	dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=MessageSyndicate'>Send Message to \[UNKNOWN\]</A> \]"
+					//	dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=RestoreBackup'>Restore Backup Routing Data</A> \]"
 			else
 				dat += "<BR>\[ <A HREF='?src=[REF(src)];operation=login'>Log In</A> \]"
 		if(STATE_CALLSHUTTLE)

code/modules/cargo/console.dm

@@ -287,3 +287,17 @@
 
 	var/datum/signal/status_signal = new(list("command" = command))
 	frequency.post_signal(src, status_signal)
+
+/obj/machinery/computer/cargo/attackby(obj/item/I, mob/living/user, params)
+	if(istype(I, /obj/item/stack/f13Cash))
+		add_caps_to_credits(I)
+		return
+	else
+		attack_hand(user)
+		return
+	return .=..()
+
+
+/obj/machinery/computer/cargo/proc/add_caps_to_credits(obj/item/stack/C, datum/export_report/report)
+	report.total_value += C.amount
+	C.use(C.amount)

code/modules/jobs/job_types/citizens.dm

@@ -279,8 +279,8 @@
 	supervisors = "NCR common law and the mayor"
 	exp_requirements = 360
 	outfit = /datum/outfit/job/citizens/f13rpdpolicechief
-	access = list(ACCESS_NRPD)
-	minimal_access = list(ACCESS_NRPD, ACCESS_NCR_COMMAND)
+	access = list(ACCESS_NRPD, ACCESS_NCR_COMMAND)
+	//minimal_access = list(ACCESS_NRPD)
 
 
 /datum/outfit/job/citizens/f13rpdpolicechief/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)

code/modules/power/lighting.dm

@@ -957,47 +957,32 @@
 /obj/machinery/light/small/ncr
 	name = "Security light bulb"
 	desc = "A refitted security lightbulb, which will turn a menacing red when the NCR garrison declare martial law."
+	light_color = LIGHT_COLOR_WHITE
 
 /obj/machinery/light/small/ncr/process()
-	if (flicker_chance && !flickering && prob(flicker_chance))
-		flicker(amount = rand(3, 8), spark = FALSE, sounds = FALSE, loud = FALSE)
-	if(!cell)
-		return flicker_chance ? null : PROCESS_KILL // only kill if we don't flicker or have a cell
-	if(has_power())
-		if (cell.charge == cell.maxcharge)
-			return PROCESS_KILL
-		cell.charge = min(cell.maxcharge, cell.charge + LIGHT_EMERGENCY_POWER_USE) //Recharge emergency power automatically while not using it
-	if(emergency_mode && !use_emergency_power(LIGHT_EMERGENCY_POWER_USE))
-		update(FALSE) //Disables emergency mode and sets the color to normal
+	. = ..()
 	if(GLOB.security_level == SEC_LEVEL_AMBER)
 		icon_state = "bulb_emergency"
+		bulb_colour = "#8B0000"
 		light_color = "#FF0000"
-		bulb_colour = "#FF3232"
-	if(GLOB.security_level < SEC_LEVEL_AMBER)
+	else if (GLOB.security_level < SEC_LEVEL_AMBER)
 		icon_state = "bulb"
-		light_color = "#FFDDCC"
 		bulb_colour = "#FFF6ED"
+		light_color = LIGHT_COLOR_WHITE
 
 /obj/machinery/light/ncr
 	name = "Security light fixture"
-	desc = "A refitted security light fixture, which will a menacing red when the NCR garrison declare martial law."
+	desc = "A refitted security light fixture, which will turn a menacing red when the NCR garrison declare martial law."
+	icon_state = "tube"
+	light_color = LIGHT_COLOR_WHITE
 
 /obj/machinery/light/ncr/process()
-	if (flicker_chance && !flickering && prob(flicker_chance))
-		flicker(amount = rand(3, 8), spark = FALSE, sounds = FALSE, loud = FALSE)
-	if(!cell)
-		return flicker_chance ? null : PROCESS_KILL // only kill if we don't flicker or have a cell
-	if(has_power())
-		if (cell.charge == cell.maxcharge)
-			return PROCESS_KILL
-		cell.charge = min(cell.maxcharge, cell.charge + LIGHT_EMERGENCY_POWER_USE) //Recharge emergency power automatically while not using it
-	if(emergency_mode && !use_emergency_power(LIGHT_EMERGENCY_POWER_USE))
-		update(FALSE) //Disables emergency mode and sets the color to normal
+	. = ..()
 	if(GLOB.security_level == SEC_LEVEL_AMBER)
 		icon_state = "tube_emergency"
-		bulb_colour = "#FF3232"
+		bulb_colour = "#8B0000"
 		light_color = "#FF0000"
-	if(GLOB.security_level < SEC_LEVEL_AMBER)
+	else if (GLOB.security_level < SEC_LEVEL_AMBER)
 		icon_state = "tube"
 		bulb_colour = "#FFF6ED"
-		light_color = "#FFDDCC"
+		light_color = LIGHT_COLOR_WHITE