diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 386f8b3a..ebfd85cb 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -137,8 +137,8 @@ #define RADIO_TOKEN_VANGRAFFS ":v" #define RADIO_CHANNEL_NRPD "NRPD" -#define RADIO_KEY_NRPD "p" -#define RADIO_TOKEN_NRPD ":p" +#define RADIO_KEY_NRPD "j" +#define RADIO_TOKEN_NRPD ":j" #define RADIO_CHANNEL_NCRCF "NCRCF" #define RADIO_KEY_NCRCF "w" @@ -183,9 +183,9 @@ #define FREQ_HOTEL 1399 //Hotel #define FREQ_BISHOPS 1401 // Bishops #define FREQ_WRIGHTS 1403 // Wrights -#define FREQ_VANGRAFFS 1405 // Van Graffs -#define FREQ_NRPD 1407 // New Reno Police Department -#define FREQ_NCRCF 1409 // New California Correctional Facility +#define FREQ_VANGRAFFS 1405 // Van Graffs +#define FREQ_NRPD 1409 // New Reno Police Department +#define FREQ_NCRCF 1413 // New California Correctional Facility #define FREQ_GOVERNMENT 1311 // Government diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index f9a33ab1..f7a45ba7 100644 --- a/code/game/machinery/computer/communications.dm +++ b/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,8 +245,8 @@ 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) @@ -254,7 +254,7 @@ 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 += "
\[ Log Out \]
" dat += "
General Functions" dat += "
\[ Message List \]" - switch(SSshuttle.emergency.mode) + /*switch(SSshuttle.emergency.mode) if(SHUTTLE_IDLE, SHUTTLE_RECALL) dat += "
\[ Call transit \]" else dat += "
\[ Cancel transit Call \]" + */ dat += "
\[ Set Status Display \]" if (authenticated==2) @@ -511,16 +512,16 @@ dat += "
\[ Send a message to station in [server] sector. \]" if(cross_servers.len > 2) dat += "
\[ Send a message to all allied stations \]" - if(SSmapping.config.allow_custom_shuttles) - dat += "
\[ Purchase Shuttle \]" + /*if(SSmapping.config.allow_custom_shuttles) + dat += "
\[ Purchase Shuttle \]"*/ dat += "
\[ Change Alert Level \]" dat += "
\[ Emergency Maintenance Access \]" - dat += "
\[ Request Nuclear Authentication Codes \]" - if(!(obj_flags & EMAGGED)) - dat += "
\[ Send Message to CentCom \]" - else - dat += "
\[ Send Message to \[UNKNOWN\] \]" - dat += "
\[ Restore Backup Routing Data \]" + //dat += "
\[ Request Nuclear Authentication Codes \]" + //if(!(obj_flags & EMAGGED)) + // dat += "
\[ Send Message to CentCom \]" + //else + // dat += "
\[ Send Message to \[UNKNOWN\] \]" + // dat += "
\[ Restore Backup Routing Data \]" else dat += "
\[ Log In \]" if(STATE_CALLSHUTTLE) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index c480d8f6..2c197b1d 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -312,7 +312,7 @@ /obj/item/encryptionkey/headset_nrpd name = "NRPD radio encryption key" - desc = "An encryption key for a radio headset. To access the NRPD channel, use :w." + desc = "An encryption key for a radio headset. To access the NRPD channel, use :p." icon_state = "cypherkey" channels = list(RADIO_CHANNEL_NRPD = 1) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index cb36be54..8629155f 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -514,7 +514,7 @@ GLOBAL_LIST_INIT(channel_tokens, list( /obj/item/radio/headset/headset_nrpd name = "NRPD radio headset" - desc = "This is used by the NRPD. \nTo access the NRPD channel, use :p." + desc = "This is used by the NRPD. \nTo access the NRPD channel, use :j." icon_state = "mine_headset" keyslot = new /obj/item/encryptionkey/headset_nrpd diff --git a/code/modules/cargo/console.dm b/code/modules/cargo/console.dm index 448e9ddf..6cc9a8b5 100644 --- a/code/modules/cargo/console.dm +++ b/code/modules/cargo/console.dm @@ -287,3 +287,15 @@ 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 + return .=..() + + +/obj/machinery/computer/cargo/proc/add_caps_to_credits(obj/item/stack/C, datum/export_report/report) + if (report) + report.total_value[src] += C.amount * 4 + C.use(C.amount) diff --git a/code/modules/jobs/job_types/citizens.dm b/code/modules/jobs/job_types/citizens.dm index 31d80ebc..027e5be2 100644 --- a/code/modules/jobs/job_types/citizens.dm +++ b/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) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 7823ff7a..d383905f 100644 --- a/code/modules/power/lighting.dm +++ b/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