diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index 38861503bba..86bc3f013a5 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -491,14 +491,25 @@ return var/jobName + var/list/accesses = list() if(istype(src, /obj/item/device/pda)) if(src:id) jobName = src:id:assignment + accesses = src:id:access if(istype(src, /obj/item/weapon/card/id)) jobName = src:assignment + accesses = src:access if(jobName in get_all_jobs()) return jobName + + var/centcom = 0 + for(var/i = 1, i <= accesses.len, i++) + if(accesses[i] > 100) + centcom = 1 + break + if(centcom) + return "centcom" else - return "Unknown" \ No newline at end of file + return "Unknown" diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm index 79faf801839..37d459777d7 100644 --- a/code/game/objects/radio/radio.dm +++ b/code/game/objects/radio/radio.dm @@ -209,7 +209,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use "mobtype" = /mob/living/silicon/ai, // the mob's type "realname" = from, // the mob's real name "name" = from, // the mob's display name - "job" = "(Automated Announcement)", // the mob's job + "job" = "Automated Announcement", // the mob's job "key" = "none", // the mob's key "vmessage" = "*garbled automated announcement*", // the message to display if the voice wasn't understood "vname" = "synthesized voice", // the name to display if the voice wasn't understood @@ -261,7 +261,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use "mobtype" = /mob/living/silicon/ai, // the mob's type "realname" = from, // the mob's real name "name" = from, // the mob's display name - "job" = "(Automated Announcement)", // the mob's job + "job" = "Automated Announcement", // the mob's job "key" = "none", // the mob's key "vmessage" = "*garbled automated announcement*", // the message to display if the voice wasn't understood "vname" = "synthesized voice", // the name to display if the voice wasn't understood @@ -294,7 +294,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use // Send a mundane broadcast with limited targets: Broadcast_Message(connection, new /mob/living/silicon/ai(src), 0, "*garbled automated announcement*", - src, message, from, "(Automated Announcement)", from, "synthesized voice", + src, message, from, "Automated Announcement", from, "synthesized voice", filter_type, signal.data["compression"]) return diff --git a/code/game/response_team.dm b/code/game/response_team.dm index edb8811e955..87901a232a7 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -190,7 +190,7 @@ proc/trigger_armed_response_team() camera.c_tag = real_name //Basic Uniform - equip_if_possible(new /obj/item/clothing/under/color/black(src), slot_w_uniform) + equip_if_possible(new /obj/item/clothing/under/syndicate/tacticool(src), slot_w_uniform) equip_if_possible(new /obj/item/device/flashlight(src), slot_l_store) equip_if_possible(new /obj/item/weapon/clipboard(src), slot_r_store) equip_if_possible(new /obj/item/weapon/gun/energy/gun(src), slot_belt) diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 4b66e30ca74..5b5a3a766b9 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -37,6 +37,16 @@ for(var/obj/O in contents) O.emp_act(severity) + attack(mob/living/M as mob, mob/living/user as mob, def_zone) + if (M == user && user.zone_sel.selecting == "mouth" && load_into_chamber()) + M.visible_message("\red [user] sticks their gun in their mouth, ready to pull the trigger...") + if(!do_after(user, 40)) + M.visible_message("\blue [user] decided life was worth living") + return + M.visible_message("\red [user] pulls the trigger.") + M.apply_damage(70, BRUTE, "head") + M.apply_damage(110, BRUTE, "chest") + return afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)//TODO: go over this if(flag) return //we're placing gun on a table or in backpack @@ -50,15 +60,6 @@ M.drop_item() del(src) return - if (target == user && user.zone_sel.selecting == "mouth") - M.visible_message("\red [user] sticks their gun in their mouth, ready to pull the trigger...") - if(!do_after(user, 20)) - M.visible_message("\blue [user] decided life was worth living") - return - M.visible_message("\red [user] pulls the trigger.") - M.apply_damage(60, BRUTE, "head") - M.apply_damage(90, BRUTE, "chest") - return if (!user.IsAdvancedToolUser()) user << "\red You don't have the dexterity to do this!" diff --git a/code/stylesheet.dm b/code/stylesheet.dm index 120caff798a..5454743afd0 100644 --- a/code/stylesheet.dm +++ b/code/stylesheet.dm @@ -94,8 +94,8 @@ h1, h2, h3, h4, h5, h6 .comradio { - color:#0028FF; - background: #FFD700; + color:#FF9966; + text-decoration: underline; } .syndradio diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 92a4a81987a..e7425bb46c3 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ