diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index 94f555b2b30..e8ab395908c 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -98,9 +98,9 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) department_flag = KARMA total_positions = 1 spawn_positions = 1 - supervisors = "the Nanotrasen Board of Directors" + supervisors = "the command staff" selection_color = "#ddddff" - idtype = /obj/item/weapon/card/id/centcom + idtype = /obj/item/weapon/card/id req_admin_notify = 1 minimal_player_age = 21 access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, @@ -126,7 +126,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/melee/baton/loaded/ntcane(H.back), slot_in_backpack) H.equip_or_collect(new /obj/item/weapon/lighter/zippo/fluff/nt_rep(H.back), slot_in_backpack) - H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/representative(H), slot_w_uniform) + H.equip_if_possible(new /obj/item/clothing/under/rank/ntrep(H), slot_w_uniform) + H.equip_if_possible(new /obj/item/clothing/suit/storage/ntrep(H), slot_wear_suit) H.equip_if_possible(new /obj/item/clothing/shoes/centcom(H), slot_shoes) H.equip_or_collect(new /obj/item/device/pda/heads/ntrep(H), slot_wear_pda) var/obj/item/weapon/implant/loyalty/L = new/obj/item/weapon/implant/loyalty(H) @@ -145,7 +146,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) spawn_positions = 1 supervisors = "the captain" selection_color = "#ddddff" - idtype = /obj/item/weapon/card/id/centcom + idtype = /obj/item/weapon/card/id req_admin_notify = 1 minimal_player_age = 21 access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, @@ -153,7 +154,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons) + access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_blueshield) minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, access_medical, access_engine, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, @@ -172,7 +173,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) H.equip_or_collect(new /obj/item/clothing/gloves/combat(H), slot_gloves) H.equip_or_collect(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) H.equip_or_collect(new /obj/item/clothing/glasses/hud/health_advanced, slot_glasses) - H.equip_if_possible(new /obj/item/clothing/under/rank/centcom/blueshield(H), slot_w_uniform) + H.equip_if_possible(new /obj/item/clothing/under/rank/blueshield(H), slot_w_uniform) H.equip_if_possible(new /obj/item/clothing/suit/armor/vest/fluff/deus_blueshield(H), slot_wear_suit) H.equip_or_collect(new /obj/item/weapon/gun/energy/advtaser(H), slot_s_store) H.equip_or_collect(new /obj/item/device/pda/heads/blueshield(H), slot_wear_pda) @@ -196,7 +197,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) spawn_positions = 1 supervisors = "the Nanotrasen Supreme Court" selection_color = "#ddddff" - idtype = /obj/item/weapon/card/id/centcom + idtype = /obj/item/weapon/card/id req_admin_notify = 1 minimal_player_age = 21 access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 3a8afe57d6a..b6e0a386cf5 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -878,7 +878,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/obj/item/weapon/card/id/centcom/W = new(M) W.name = "[M.real_name]'s ID Card (Nanotrasen Navy Officer)" - W.assignment = "Nanotrasen Navy Officer" + W.assignment = "Nanotrasen Navy Officer" W.access = get_centcom_access(W.assignment) W.registered_name = M.real_name M.equip_if_possible(W, slot_wear_id) @@ -903,13 +903,13 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that var/obj/item/weapon/card/id/centcom/W = new(M) W.name = "[M.real_name]'s ID Card (Nanotrasen Navy Captain)" W.access = get_all_accesses() - W.assignment = "Nanotrasen Navy Captain" + W.assignment = "Nanotrasen Navy Captain" W.access = get_centcom_access(W.assignment) W.registered_name = M.real_name M.equip_if_possible(W, slot_wear_id) if("emergency response team member") - M.equip_to_slot_or_del(new /obj/item/clothing/under/ert(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(M), slot_l_ear) @@ -931,7 +931,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that pda.name = "PDA-[M.real_name] ([pda.ownjob])" if("emergency response team leader") - M.equip_to_slot_or_del(new /obj/item/clothing/under/ert(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/combat(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves) M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert/alt(M), slot_l_ear) @@ -1144,7 +1144,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that W.name = "[M.real_name]'s ID Card (Deathsquad Officer)" W.icon_state = "centcom" W.assignment = "Deathsquad Officer" - W.access = get_centcom_access(W.assignment) + W.access = get_centcom_access(W.assignment) W.registered_name = M.real_name M.equip_to_slot_or_del(W, slot_wear_id) diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 8672b135934..7f8abfb3fe1 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -228,6 +228,34 @@ return usr.update_inv_wear_suit() //so our overlays update +/obj/item/clothing/suit/storage/ntrep + name = "NanoTrasen Representative Jacket" + desc = "A fancy black jacket, standard issue to NanoTrasen Represenatives." + icon_state = "ntrep" + item_state = "ia_jacket" + blood_overlay_type = "coat" + body_parts_covered = UPPER_TORSO|ARMS + + verb/toggle() + set name = "Toggle Coat Buttons" + set category = "Object" + set src in usr + + if(!usr.canmove || usr.stat || usr.restrained()) + return 0 + + switch(icon_state) + if("ntrep_open") + src.icon_state = "ntrep" + usr << "You button up the jacket." + if("ntrep") + src.icon_state = "ntrep_open" + usr << "You unbutton the jacket." + else + usr << "You attempt to button-up the velcro on your [src], before promptly realising how retarded you are." + return + usr.update_inv_wear_suit() //so our overlays update + //Medical /obj/item/clothing/suit/storage/fr_jacket name = "first responder jacket" diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 6510fff5094..ece479485c3 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -131,6 +131,18 @@ "Vox" = 'icons/mob/species/vox/uniform.dmi' ) +/obj/item/clothing/under/rank/ntrep + desc = "A well-ironed dress shirt and matching set of black pants." + name = "dress shirt" + icon_state = "internalaffairs" + item_state = "internalaffairs" + _color = "internalaffairs" + flags = ONESIZEFITSALL + species_fit = list("Vox") + sprite_sheets = list( + "Vox" = 'icons/mob/species/vox/uniform.dmi' + ) + /obj/item/clothing/under/rank/janitor desc = "It's the official uniform of the station's janitor. It has minor protection from biohazards." diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 69eb575e158..3b9874b9a4a 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -108,13 +108,14 @@ _color = "officer" displays_id = 0 flags = ONESIZEFITSALL - -/obj/item/clothing/under/ert - name = "ERT tactical uniform" - desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. It looks very tactical." + +/obj/item/clothing/under/rank/blueshield + name = "blueshield uniform" + desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. Standard issue to Blueshield officers." icon_state = "ert_uniform" item_state = "bl_suit" _color = "ert_uniform" + armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) /obj/item/clothing/under/space name = "\improper NASA jumpsuit" @@ -659,4 +660,3 @@ icon_state = "griffin" _color = "griffin" flags = NODROP - \ No newline at end of file diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index c867306c98c..c3211a2b808 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 76128e4066f..5296ad94135 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ