From 28e4ef603ec2f955cf94dae9b9cc464ee773c1d2 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Fri, 26 Jan 2018 16:16:43 -0500 Subject: [PATCH] VS: Steal Southern Cross jobs with tweaks --- code/game/jobs/job/special_sc_vr.dm | 194 --------------------- code/game/jobs/jobs.dm | 5 - maps/southern_cross/southern_cross_jobs.dm | 19 +- vorestation.dme | 6 +- 4 files changed, 15 insertions(+), 209 deletions(-) delete mode 100644 code/game/jobs/job/special_sc_vr.dm diff --git a/code/game/jobs/job/special_sc_vr.dm b/code/game/jobs/job/special_sc_vr.dm deleted file mode 100644 index 8750fc6578e..00000000000 --- a/code/game/jobs/job/special_sc_vr.dm +++ /dev/null @@ -1,194 +0,0 @@ -//These are a copy of Polaris' Southern Cross jobs - -var/const/access_pilot = 67 -var/const/access_explorer = 43 - -//////////////////////////////////////////////////////////// - -/datum/access/pilot - id = access_pilot - desc = "Pilot" - region = ACCESS_REGION_SUPPLY - -/datum/access/explorer - id = access_explorer - desc = "Explorer" - region = ACCESS_REGION_GENERAL - -//////////////////////////////////////////////////////////// - -/obj/item/weapon/card/id/medical/sar - assignment = "Search and Rescue" - rank = "Search and Rescue" - job_access_type = /datum/job/sar - -/obj/item/weapon/card/id/civilian/pilot - assignment = "Pilot" - rank = "Pilot" - job_access_type = /datum/job/pilot - -/obj/item/weapon/card/id/civilian/explorer - assignment = "Explorer" - rank = "Explorer" - job_access_type = /datum/job/explorer - -//////////////////////////////////////////////////////////// - -/datum/job/pilot - title = "Pilot" - flag = PILOT - department = "Civilian" - department_flag = MEDSCI - faction = "Station" - total_positions = 2 - spawn_positions = 2 - supervisors = "the head of personnel" - selection_color = "#515151" - idtype = /obj/item/weapon/card/id/civilian/pilot - economic_modifier = 4 - whitelist_only = 1 - latejoin_only = 1 - access = list(access_pilot, access_cargo, access_mining, access_mining_station) - minimal_access = list(access_pilot, access_cargo, access_mining, access_mining_station) - outfit_type = /decl/hierarchy/outfit/job/pilot - -/datum/job/explorer - title = "Explorer" - flag = EXPLORER - department = "Science" - department_flag = MEDSCI - faction = "Station" - total_positions = 4 - spawn_positions = 4 - supervisors = "the explorer leader and the head of personnel" - selection_color = "#515151" - idtype = /obj/item/weapon/card/id/civilian/explorer - economic_modifier = 4 - whitelist_only = 1 - latejoin_only = 1 - access = list(access_pilot, access_explorer) - minimal_access = list(access_pilot, access_explorer) - outfit_type = /decl/hierarchy/outfit/job/explorer2 -/* I split this into multiple jobs because it's set to latejoin_only, which means you can't see it to select alt titles. - alt_titles = list( - "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, - "Explorer Medic" = /decl/hierarchy/outfit/job/explorer2/medic) -*/ - -/datum/job/explorer/technician - title = "Explorer Technician" - flag = EXPLORER_T - outfit_type = /decl/hierarchy/outfit/job/explorer2/technician - -/datum/job/explorer/medic - title = "Explorer Medic" - flag = EXPLORER_M - outfit_type = /decl/hierarchy/outfit/job/explorer2/medic - -/datum/job/sar - title = "Search and Rescue" - flag = SAR - department = "Medical" - department_flag = MEDSCI - faction = "Station" - total_positions = 2 - spawn_positions = 2 - supervisors = "the chief medical officer" - selection_color = "#515151" - idtype = /obj/item/weapon/card/id/medical - economic_modifier = 4 - whitelist_only = 1 - latejoin_only = 1 - access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer) - minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer) - outfit_type = /decl/hierarchy/outfit/job/medical/sar - -//////////////////////////////////////////////////////////// - -/decl/hierarchy/outfit/job/explorer2 - name = OUTFIT_JOB_NAME("Explorer") - shoes = /obj/item/clothing/shoes/boots/winter/explorer - uniform = /obj/item/clothing/under/explorer - l_ear = /obj/item/device/radio/headset/explorer - id_slot = slot_wear_id - pda_slot = slot_l_store - pda_type = /obj/item/device/pda/cargo // Brown looks more rugged - id_type = /obj/item/weapon/card/id/civilian/explorer - id_pda_assignment = "Explorer" - -/decl/hierarchy/outfit/job/explorer2/technician - name = OUTFIT_JOB_NAME("Explorer Technician") - belt = /obj/item/weapon/storage/belt/utility/full - pda_slot = slot_l_store - id_pda_assignment = "Explorer Technician" - -/decl/hierarchy/outfit/job/explorer2/medic - name = OUTFIT_JOB_NAME("Explorer Medic") - l_hand = /obj/item/weapon/storage/firstaid/regular - pda_slot = slot_l_store - id_pda_assignment = "Explorer Medic" - -/decl/hierarchy/outfit/job/pilot - name = OUTFIT_JOB_NAME("Pilot") - shoes = /obj/item/clothing/shoes/black - uniform = /obj/item/clothing/under/color/black - suit = /obj/item/clothing/suit/storage/toggle/bomber - gloves = /obj/item/clothing/gloves/fingerless - glasses = /obj/item/clothing/glasses/fakesunglasses/aviator - l_ear = /obj/item/device/radio/headset/pilot - id_slot = slot_wear_id - pda_slot = slot_belt - pda_type = /obj/item/device/pda/cargo // Brown looks more rugged - id_type = /obj/item/weapon/card/id/civilian/pilot - id_pda_assignment = "Pilot" - -/decl/hierarchy/outfit/job/medical/sar - name = OUTFIT_JOB_NAME("Search and Rescue") - uniform = /obj/item/clothing/under/utility/blue - suit = /obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar - shoes = /obj/item/clothing/shoes/boots/winter/explorer - l_hand = /obj/item/weapon/storage/firstaid/adv - belt = /obj/item/weapon/storage/belt/medical/emt - pda_slot = slot_l_store - id_type = /obj/item/weapon/card/id/medical/sar - id_pda_assignment = "Search and Rescue" - flags = OUTFIT_HAS_BACKPACK|OUTFIT_EXTENDED_SURVIVAL - -//////////////////////////////////////////////////////////// - -/obj/item/device/encryptionkey/pilot - name = "pilot's encryption key" - icon_state = "com_cypherkey" - channels = list("Supply" = 1, "Explorer" = 1) - -/obj/item/device/encryptionkey/explorer - name = "explorer radio encryption key" - icon_state = "com_cypherkey" - channels = list("Explorer" = 1) - -//////////////////////////////////////////////////////////// - -/obj/item/device/radio/headset/pilot - name = "pilot's headset" - desc = "A bowman headset used by pilots, has access to supply and explorer channels." - icon_state = "cargo_headset_alt" - item_state = "headset" - ks2type = /obj/item/device/encryptionkey/pilot - -/obj/item/device/radio/headset/explorer - name = "explorer's headset" - desc = "Headset used by explorers for exploring. Access to the explorer channel." - icon_state = "mine_headset" - item_state = "headset" - ks2type = /obj/item/device/encryptionkey/explorer - -//////////////////////////////////////////////////////////// - -/obj/item/clothing/suit/storage/hooded/wintercoat/medical/sar - name = "search and rescue winter coat" - desc = "A heavy winter jacket. A white star of life is emblazoned on the back, with the words search and rescue written underneath." - icon_state = "coatsar" - item_icons = list(slot_wear_suit_str = 'maps/southern_cross/icons/mob/sc_suit.dmi') - icon = 'maps/southern_cross/icons/obj/sc_suit.dmi' - armor = list(melee = 15, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 50, rad = 5) - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 083c3699b8d..d2905c3a611 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -26,11 +26,6 @@ var/const/PSYCHIATRIST =(1<<7) var/const/ROBOTICIST =(1<<8) var/const/XENOBIOLOGIST =(1<<9) var/const/PARAMEDIC =(1<<10) -var/const/SAR =(1<<11) //VOREStation THEFT -var/const/PILOT =(1<<12) //VOREStation THEFT -var/const/EXPLORER =(1<<13) //VOREStation THEFT -var/const/EXPLORER_T =(1<<14) //VOREStation THEFT -var/const/EXPLORER_M =(1<<15) //VOREStation THEFT var/const/CIVILIAN =(1<<2) diff --git a/maps/southern_cross/southern_cross_jobs.dm b/maps/southern_cross/southern_cross_jobs.dm index 8a8c3b5b110..08cff4c857d 100644 --- a/maps/southern_cross/southern_cross_jobs.dm +++ b/maps/southern_cross/southern_cross_jobs.dm @@ -1,8 +1,9 @@ +//VORESTATION EDIT!!! This whole file is being included by hand to get these jobs rather than using the map datum itself. // Pilots var/const/SAR =(1<<11) -var/const/PILOT =(1<<13) -var/const/EXPLORER =(1<<14) +var/const/PILOT =(1<<15) //VOREStation Edit - Bumped up 2 +var/const/EXPLORER =(1<<12) //VOREStation Edit - Moved to science var/const/access_pilot = 67 var/const/access_explorer = 43 @@ -87,17 +88,17 @@ var/const/access_explorer = 43 /datum/job/explorer title = "Explorer" flag = EXPLORER - department = "Civilian" - department_flag = CIVILIAN + department = "Science" //VOREStation Edit + department_flag = MEDSCI //VOREStation Edit faction = "Station" total_positions = 4 spawn_positions = 4 - supervisors = "the explorer leader and the head of personnel" - selection_color = "#515151" + supervisors = "the research director" //VOREStation Edit + selection_color = "#633D63" //VOREStation Edit idtype = /obj/item/weapon/card/id/civilian/explorer economic_modifier = 4 - access = list(access_pilot, access_explorer) - minimal_access = list(access_pilot, access_explorer) + access = list(access_pilot, access_explorer, access_research) //VOREStation Edit + minimal_access = list(access_pilot, access_explorer, access_research) //VOREStation Edit outfit_type = /decl/hierarchy/outfit/job/explorer2 alt_titles = list( "Explorer Technician" = /decl/hierarchy/outfit/job/explorer2/technician, @@ -112,7 +113,7 @@ var/const/access_explorer = 43 total_positions = 2 spawn_positions = 2 supervisors = "the chief medical officer" - selection_color = "#515151" + selection_color = "#013D3B" //VOREStation Edit idtype = /obj/item/weapon/card/id/medical economic_modifier = 4 access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer) diff --git a/vorestation.dme b/vorestation.dme index d55bb76d6cb..53e032a3a3a 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -613,7 +613,6 @@ #include "code\game\jobs\job\security.dm" #include "code\game\jobs\job\silicon.dm" #include "code\game\jobs\job\special.dm" -#include "code\game\jobs\job\special_sc_vr.dm" #include "code\game\jobs\job\z_all_jobs_vr.dm" #include "code\game\machinery\adv_med.dm" #include "code\game\machinery\adv_med_vr.dm" @@ -2756,6 +2755,11 @@ #include "maps\RandomZLevels\listeningpost.dm" #include "maps\RandomZLevels\snowfield.dm" #include "maps\RandomZLevels\zoo.dm" +#include "maps\southern_cross\southern_cross_jobs.dm" +#include "maps\southern_cross\items\encryptionkey_sc.dm" +#include "maps\southern_cross\items\headset_sc.dm" +#include "maps\southern_cross\items\clothing\sc_suit.dm" +#include "maps\southern_cross\job\outfits.dm" #include "maps\submaps\_readme.dm" #include "maps\submaps\engine_submaps\engine.dm" #include "maps\submaps\engine_submaps\engine_areas.dm"