This commit is contained in:
Spades
2017-09-03 14:33:13 -04:00
parent e5ec6eb3d2
commit 2dd7519e1b
2 changed files with 115 additions and 3 deletions

View File

@@ -385,7 +385,7 @@
for(var/areatype in areas_without_camera)
world << "* [areatype]"
/client/proc/cmd_admin_dress()
/client/proc/cmd_admin_dress() // Vorestation Edits throughout this proc.
set category = "Fun"
set name = "Select equipment"
@@ -417,7 +417,12 @@
"emergency response team",
"nanotrasen representative",
"nanotrasen officer",
"nanotrasen captain"
"nanotrasen captain",
"UNSC marine",
"UNSC officer",
"SolGov Representative",
"Imperial soldier",
"Imperial officer"
)
var/dresscode = input("Select dress for [M]", "Robust quick dress shop") as null|anything in dresspacks
if (isnull(dresscode))
@@ -691,7 +696,7 @@
M.equip_to_slot_or_del(W, slot_wear_id)
if("emergency response team")
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/under/ert(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/swat(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/ert(M), slot_l_ear)
@@ -783,6 +788,109 @@
W.assignment = "Admiral"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("UNSC marine")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/combat/unsc(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(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/centcom(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/under/utility/marine/green(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/combat/unsc(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/battlerifle(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/tactical(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_l_hand)
var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s military ID Card"
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "UNSC"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("UNSC officer")
M.equip_to_slot_or_del(new /obj/item/clothing/head/dress/marine/command/admiral(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/under/mildress/marine/command(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/consul(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/s44(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/s44(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/clothing/accessory/holster/hip(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(M), slot_l_hand)
var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s military ID Card"
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "UNSC"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("SolGov Representative")
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/under/suit_jacket/navy (M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/pen/blue(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/weapon/pen/red(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/device/pda/centcom(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/weapon/clipboard(M), slot_l_hand)
var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s SolGov ID Card"
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "SolGov Representative"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("Imperial soldier")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/combat/imperial(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/leg_guard/combat/imperial(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/arm_guard/combat/imperial(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/syndicate(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/under/imperial(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/imperial(M), slot_wear_mask)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/combat/imperial(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/tactical/bandolier(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/weapon/cell/device/weapon(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/weapon/cell/device/weapon(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/imperial(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/weapon/shield/energy/imperial(M), slot_l_hand)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/imperial(M), slot_s_store)
/*var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s ID Card" // ToDo
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "SolGov Representative"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)*/
if("Imperial officer")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/combat/imperial/centurion(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/leg_guard/combat/imperial(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/arm_guard/combat/imperial(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/syndicate(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/under/imperial(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/imperial(M), slot_wear_mask)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/combat/imperial/centurion(M), slot_wear_suit)
//M.equip_to_slot_or_del(new (M), slot_back) // Doesn't look right with the cape. No bags.
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/tactical/bandolier(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/weapon/cell/device/weapon(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/weapon/cell/device/weapon(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword/imperial(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/weapon/shield/energy/imperial(M), slot_l_hand)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/imperial(M), slot_s_store)
/*var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s ID Card" // ToDo
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "SolGov Representative"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)*/
M.regenerate_icons()