Merge pull request #1711 from Markolie/icons

Add barber hud icon, add unique ID card for supervisors
This commit is contained in:
Fox-McCloud
2015-08-12 16:32:33 -04:00
4 changed files with 9 additions and 5 deletions
+3 -3
View File
@@ -102,7 +102,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
spawn_positions = 1
supervisors = "the command staff"
selection_color = "#ddddff"
idtype = /obj/item/weapon/card/id/silver
idtype = /obj/item/weapon/card/id/nanotrasen
req_admin_notify = 1
minimal_player_age = 21
access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
@@ -148,7 +148,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
spawn_positions = 1
supervisors = "the nanotrasen representative"
selection_color = "#ddddff"
idtype = /obj/item/weapon/card/id/silver
idtype = /obj/item/weapon/card/id/nanotrasen
req_admin_notify = 1
minimal_player_age = 21
access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
@@ -195,7 +195,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/silver
idtype = /obj/item/weapon/card/id/nanotrasen
req_admin_notify = 1
minimal_player_age = 30
access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers,
+6 -2
View File
@@ -457,6 +457,10 @@
/obj/item/weapon/card/id/centcom/New()
access = get_all_centcom_access()
..()
/obj/item/weapon/card/id/nanotrasen
name = "nanotrasen ID card"
icon_state = "nanotrasen"
/obj/item/weapon/card/id/prisoner
name = "prisoner ID card"
@@ -646,10 +650,10 @@
override_name = 1
/proc/get_station_card_skins()
return list("data","id","gold","silver","security","medical","research","engineering","HoS","CMO","RD","CE","clown","mime","prisoner","rainbow")
return list("data","id","gold","silver","security","medical","research","engineering","HoS","CMO","RD","CE","clown","mime","rainbow","prisoner")
/proc/get_centcom_card_skins()
return list("centcom","centcom_old","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","deathsquad","commander","syndie","TDred","TDgreen")
return list("centcom","centcom_old","nanotrasen","ERT_leader","ERT_empty","ERT_security","ERT_engineering","ERT_medical","ERT_janitorial","deathsquad","commander","syndie","TDred","TDgreen")
/proc/get_all_card_skins()
return get_station_card_skins() + get_centcom_card_skins()