From 1c77dda5524495f5ec0732379a2d09b4d0f7e9d0 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Sat, 14 May 2016 18:02:36 -0400 Subject: [PATCH] Adds centcom jobs, headset, PDA, as-of-yet unused hud_vr soon-to-be-used --- code/game/jobs/access.dm | 4 +- code/game/jobs/job/special.dm | 83 +++++++++++++++++++ code/game/objects/items/devices/PDA/PDA_vr.dm | 5 ++ .../objects/items/devices/radio/headset_vr.dm | 13 +++ code/modules/clothing/glasses/hud_vr.dm | 0 vorestation.dme | 4 + 6 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 code/game/jobs/job/special.dm create mode 100644 code/game/objects/items/devices/PDA/PDA_vr.dm create mode 100644 code/game/objects/items/devices/radio/headset_vr.dm create mode 100644 code/modules/clothing/glasses/hud_vr.dm diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index d95c555e0f..074d90f682 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -188,7 +188,9 @@ "BlackOps Commander", "Supreme Commander", "Emergency Response Team", - "Emergency Response Team Leader") + "Emergency Response Team Leader", + "Centcom Visitor", + "Centcom Officer") /mob/proc/GetIdCard() return null diff --git a/code/game/jobs/job/special.dm b/code/game/jobs/job/special.dm new file mode 100644 index 0000000000..f5a18e2f0b --- /dev/null +++ b/code/game/jobs/job/special.dm @@ -0,0 +1,83 @@ +/datum/job/centcom_officer //For Business + title = "Centcom Officer" + department = "Command" + head_position = 1 + faction = "Station" + total_positions = 2 + spawn_positions = 1 + supervisors = "company officials and Corporate Regulations" + selection_color = "#1D1D4F" + idtype = /obj/item/weapon/card/id/centcom + access = list() + minimal_access = list() + minimal_player_age = 14 + economic_modifier = 20 + whitelist_only = 1 + + minimum_character_age = 25 + ideal_character_age = 40 + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(H), slot_l_ear) + switch(H.backbag) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom, slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/centcom(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security(H), slot_l_store) + + H.implant_loyalty() + + return 1 + + get_access() + var/access = get_all_station_access() + access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer") + return access + +/datum/job/centcom_visitor //For Pleasure + title = "Centcom Visitor" + department = "Civilian" + head_position = 1 + faction = "Station" + total_positions = 2 + spawn_positions = 1 + supervisors = "company officials and Corporate Regulations" + selection_color = "#1D1D4F" + idtype = /obj/item/weapon/card/id/centcom + access = list() + minimal_access = list() + minimal_player_age = 14 + economic_modifier = 20 + whitelist_only = 1 + + minimum_character_age = 25 + ideal_character_age = 40 + + equip(var/mob/living/carbon/human/H) + if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(H), slot_l_ear) + switch(H.backbag) + if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) + if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + if(4) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom, slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/device/pda/centcom(H), slot_belt) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/gloves/white(H), slot_gloves) + H.equip_to_slot_or_del(new /obj/item/clothing/head/beret/centcom/officer(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security(H), slot_l_store) + + H.implant_loyalty() + + return 1 + + get_access() + var/access = get_all_station_access() + access += list("VIP Guest","Custodian","Thunderdome Overseer","Intel Officer","Medical Officer","Death Commando","Research Officer") + return access diff --git a/code/game/objects/items/devices/PDA/PDA_vr.dm b/code/game/objects/items/devices/PDA/PDA_vr.dm new file mode 100644 index 0000000000..037c9777ac --- /dev/null +++ b/code/game/objects/items/devices/PDA/PDA_vr.dm @@ -0,0 +1,5 @@ +/obj/item/device/pda/centcom + default_cartridge = /obj/item/weapon/cartridge/captain + icon_state = "pda-h" + detonate = 0 +// hidden = 1 \ No newline at end of file diff --git a/code/game/objects/items/devices/radio/headset_vr.dm b/code/game/objects/items/devices/radio/headset_vr.dm new file mode 100644 index 0000000000..6ead61ead1 --- /dev/null +++ b/code/game/objects/items/devices/radio/headset_vr.dm @@ -0,0 +1,13 @@ +/obj/item/device/radio/headset/centcom + name = "centcom radio headset" + desc = "The headset of the boss's boss." + icon_state = "com_headset" + item_state = "headset" + ks2type = /obj/item/device/encryptionkey/ert + +/obj/item/device/radio/headset/centcom/alt + name = "centcom bowman headset" + desc = "The headset of the boss's boss." + icon_state = "com_headset_alt" + item_state = "com_headset_alt" + ks2type = /obj/item/device/encryptionkey/ert \ No newline at end of file diff --git a/code/modules/clothing/glasses/hud_vr.dm b/code/modules/clothing/glasses/hud_vr.dm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/vorestation.dme b/vorestation.dme index 717aa4dfb9..ee2c666eb3 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -378,6 +378,7 @@ #include "code\game\jobs\job\science.dm" #include "code\game\jobs\job\security.dm" #include "code\game\jobs\job\silicon.dm" +#include "code\game\jobs\job\special.dm" #include "code\game\machinery\adv_med.dm" #include "code\game\machinery\adv_med_vr.dm" #include "code\game\machinery\ai_slipper.dm" @@ -649,11 +650,13 @@ #include "code\game\objects\items\devices\PDA\cart.dm" #include "code\game\objects\items\devices\PDA\chatroom.dm" #include "code\game\objects\items\devices\PDA\PDA.dm" +#include "code\game\objects\items\devices\PDA\PDA_vr.dm" #include "code\game\objects\items\devices\PDA\radio.dm" #include "code\game\objects\items\devices\radio\beacon.dm" #include "code\game\objects\items\devices\radio\electropack.dm" #include "code\game\objects\items\devices\radio\encryptionkey.dm" #include "code\game\objects\items\devices\radio\headset.dm" +#include "code\game\objects\items\devices\radio\headset_vr.dm" #include "code\game\objects\items\devices\radio\intercom.dm" #include "code\game\objects\items\devices\radio\radio.dm" #include "code\game\objects\items\robot\robot_items.dm" @@ -1039,6 +1042,7 @@ #include "code\modules\clothing\ears\skrell.dm" #include "code\modules\clothing\glasses\glasses.dm" #include "code\modules\clothing\glasses\hud.dm" +#include "code\modules\clothing\glasses\hud_vr.dm" #include "code\modules\clothing\gloves\arm_guards.dm" #include "code\modules\clothing\gloves\boxing.dm" #include "code\modules\clothing\gloves\color.dm"