diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index d275d9e089..eac0708ded 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -70,15 +70,6 @@ var/override_map /datum/map_config/New() - survivor_types = list( - /datum/equipment_preset/survivor/scientist, - /datum/equipment_preset/survivor/doctor, - /datum/equipment_preset/survivor/chef, - /datum/equipment_preset/survivor/chaplain, - /datum/equipment_preset/survivor/miner, - /datum/equipment_preset/survivor/colonial_marshal, - /datum/equipment_preset/survivor/engineer, - ) synth_survivor_types = list( /datum/equipment_preset/synth/survivor/medical_synth, diff --git a/code/datums/skills/civilian.dm b/code/datums/skills/civilian.dm index 9b55adc9b1..2d07d32aa3 100644 --- a/code/datums/skills/civilian.dm +++ b/code/datums/skills/civilian.dm @@ -19,8 +19,6 @@ CIVILIAN SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED, SKILL_LEADERSHIP = SKILL_LEAD_MASTER, SKILL_OVERWATCH = SKILL_OVERWATCH_TRAINED, - SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, - SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, SKILL_INTEL = SKILL_INTEL_EXPERT, ) @@ -59,7 +57,7 @@ CIVILIAN SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, ) -/datum/skills/civilian/survivor/manager +/datum/skills/civilian/manager name = "Weyland-Yutani Manager" skills = list( SKILL_LEADERSHIP = SKILL_LEAD_MASTER, @@ -68,19 +66,19 @@ CIVILIAN SKILL_INTEL = SKILL_INTEL_EXPERT, ) -/datum/skills/civilian/survivor/goon - name = "Survivor Goon" +/datum/skills/civilian/security + name = "Security" skills = list( SKILL_CQC = SKILL_CQC_TRAINED, SKILL_POLICE = SKILL_POLICE_SKILLED, SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, SKILL_ENDURANCE = SKILL_ENDURANCE_SURVIVOR, - SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) -/datum/skills/civilian/survivor/pmc +/datum/skills/civilian/pmc name = "Survivor PMC" additional_skills = list( SKILL_CQC = SKILL_CQC_TRAINED, @@ -91,7 +89,7 @@ CIVILIAN SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) -/datum/skills/civilian/survivor/pmc/medic +/datum/skills/civilian/pmc/medic name = "Survivor PMC Medic" additional_skills = list( SKILL_POLICE = SKILL_POLICE_SKILLED, @@ -103,7 +101,7 @@ CIVILIAN SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) -/datum/skills/civilian/survivor/pmc/engineer +/datum/skills/civilian/pmc/engineer name = "Survivor PMC Engineer" additional_skills = list( SKILL_POLICE = SKILL_POLICE_SKILLED, @@ -117,14 +115,14 @@ CIVILIAN SKILL_POWERLOADER = SKILL_POWERLOADER_MASTER, ) -/datum/skills/civilian/survivor/doctor +/datum/skills/civilian/doctor name = "Survivor Doctor" additional_skills = list( SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, SKILL_SURGERY = SKILL_SURGERY_TRAINED, ) -/datum/skills/civilian/survivor/clf +/datum/skills/civilian/clf name = "Survivor CLF" additional_skills = list( SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, @@ -133,7 +131,7 @@ CIVILIAN SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, ) -/datum/skills/civilian/survivor/scientist +/datum/skills/civilian/scientist name = "Survivor Scientist" additional_skills = list( SKILL_MEDICAL = SKILL_MEDICAL_DOCTOR, @@ -141,14 +139,14 @@ CIVILIAN SKILL_RESEARCH = SKILL_RESEARCH_TRAINED, ) -/datum/skills/civilian/survivor/chef +/datum/skills/civilian/chef name = "Survivor Chef" additional_skills = list( SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, SKILL_DOMESTIC = SKILL_DOMESTIC_TRAINED, ) -/datum/skills/civilian/survivor/miner +/datum/skills/civilian/miner name = "Survivor Miner" additional_skills = list( SKILL_ENGINEER = SKILL_ENGINEER_TRAINED, @@ -156,14 +154,14 @@ CIVILIAN SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) -/datum/skills/civilian/survivor/trucker +/datum/skills/civilian/trucker name = "Survivor Trucker" additional_skills = list( SKILL_ENGINEER = SKILL_ENGINEER_ENGI, SKILL_VEHICLE = SKILL_VEHICLE_CREWMAN, ) -/datum/skills/civilian/survivor/engineer +/datum/skills/civilian/engineer name = "Survivor Engineer" additional_skills = list( SKILL_ENGINEER = SKILL_ENGINEER_ENGI, @@ -172,13 +170,13 @@ CIVILIAN SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) -/datum/skills/civilian/survivor/chaplain +/datum/skills/civilian/chaplain name = "Survivor Chaplain" additional_skills = list( SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, ) -/datum/skills/civilian/survivor/marshal +/datum/skills/civilian/marshal name = "Survivor Marshal" skills = list( SKILL_ENGINEER = SKILL_ENGINEER_ENGI, @@ -195,7 +193,7 @@ CIVILIAN SKILL_FIREARMS = SKILL_FIREARMS_TRAINED, ) -/datum/skills/civilian/survivor/prisoner +/datum/skills/civilian/prisoner name = "Survivor Prisoner" additional_skills = list( SKILL_CQC = SKILL_CQC_SKILLED, @@ -204,7 +202,7 @@ CIVILIAN SKILL_VEHICLE = SKILL_VEHICLE_SMALL, ) -/datum/skills/civilian/survivor/gangleader +/datum/skills/civilian/gangleader name = "Survivor Gang Leader" additional_skills = list( SKILL_CQC = SKILL_CQC_SKILLED, diff --git a/code/game/jobs/job/antag/xeno/xenomorph.dm b/code/game/jobs/job/antag/xeno/xenomorph.dm index 78b6ab7e3a..758d43c67b 100644 --- a/code/game/jobs/job/antag/xeno/xenomorph.dm +++ b/code/game/jobs/job/antag/xeno/xenomorph.dm @@ -34,14 +34,6 @@ human_to_transform.set_stat(UNCONSCIOUS) human_to_transform.forceMove(get_turf(pick(GLOB.xeno_spawns))) - var/list/survivor_types = list( - /datum/equipment_preset/survivor/scientist, - /datum/equipment_preset/survivor/doctor, - /datum/equipment_preset/survivor/security, - /datum/equipment_preset/survivor/engineer - ) - arm_equipment(human_to_transform, pick(survivor_types), FALSE, FALSE) - for(var/obj/item/device/radio/radio in human_to_transform.contents_recursive()) radio.listening = FALSE diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm index 410fc05e10..b08642f8b9 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm @@ -85,8 +85,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_upp_medic, list( list("Essential Medical Set", 0, /obj/effect/essentials_set/medic, MARINE_CAN_BUY_ESSENTIALS, VENDOR_ITEM_MANDATORY), list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("Standard Apparel", 0, list(/obj/item/clothing/gloves/marine/veteran/upp, /obj/item/clothing/head/helmet/marine/veteran/UPP), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("Combat Gloves", 0, /obj/item/clothing/gloves/marine, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + list("Standard Apparel", 0, list(/obj/item/clothing/gloves/marine/brown, /obj/item/clothing/head/helmet/marine/veteran/UPP), MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), list("Ration", 0, /obj/item/reagent_container/food/snacks/upp, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), list("ARMOR (CHOOSE 1)", 0, null, null, null), diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 181d883da7..35428d6324 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -521,7 +521,7 @@ /obj/item/storage/pouch/magazine/large/rifle_heap/fill_preset_inventory() for(var/i = 1 to storage_slots) - new /obj/item/ammo_magazine/rifle/heap(src) + new /obj/item/ammo_magazine/rifle/m41aMK1/heap(src) /obj/item/storage/pouch/magazine/large/smg_heap/fill_preset_inventory() for(var/i = 1 to storage_slots) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 8e58f92b19..bf73b2b490 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -364,6 +364,7 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( armor_bio = CLOTHING_ARMOR_MEDIUM armor_rad = CLOTHING_ARMOR_LOW armor_internaldamage = CLOTHING_ARMOR_MEDIUM + clothing_traits = list(TRAIT_EAR_PROTECTION) health = 5 force = 15 throwforce = 15 // https://i.imgur.com/VW09I4B.gif diff --git a/code/modules/clothing/suits/civilian_suit.dm b/code/modules/clothing/suits/civilian_suit.dm index 25dbb74f78..0fc12e3088 100644 --- a/code/modules/clothing/suits/civilian_suit.dm +++ b/code/modules/clothing/suits/civilian_suit.dm @@ -402,13 +402,3 @@ desc = "A green windbreaker." icon_state = "windbreaker_green" -/obj/item/clothing/suit/storage/windbreaker/windbreaker_fr - name = "first responder windbreaker" - desc = "A brown windbreaker with reflective strips commonly worn by first responders." - icon_state = "windbreaker_fr" - -/obj/item/clothing/suit/storage/windbreaker/windbreaker_covenant - name = "explorer's windbreaker" - desc = "A brown windbreaker covered in various patches tying it to one of the first explorations into this sector." - icon_state = "windbreaker_covenant" - diff --git a/code/modules/cm_marines/equipment/kit_boxes.dm b/code/modules/cm_marines/equipment/kit_boxes.dm index 6058ae93ec..c1a9a33f76 100644 --- a/code/modules/cm_marines/equipment/kit_boxes.dm +++ b/code/modules/cm_marines/equipment/kit_boxes.dm @@ -411,7 +411,6 @@ /obj/item/storage/box/kit/mini_engineer/fill_preset_inventory() new /obj/item/storage/backpack/marine/engineerpack(src) new /obj/item/pamphlet/skill/engineer(src) - new /obj/item/clothing/gloves/marine/insulated(src) new /obj/item/tool/crowbar(src) new /obj/item/clothing/glasses/welding(src) new /obj/item/storage/pouch/tools/pfc(src) diff --git a/code/modules/gear_presets/cmb.dm b/code/modules/gear_presets/cmb.dm index 6f775a8ffe..b290b6df6c 100644 --- a/code/modules/gear_presets/cmb.dm +++ b/code/modules/gear_presets/cmb.dm @@ -49,7 +49,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/cmb/standard - name = "Prop - CMB - Colonial Marshal Deputy" + name = "Prop - UA - Deputy" paygrade = "GS-9" role_comm_title = "CMB DEP" flags = EQUIPMENT_PRESET_EXTRA @@ -129,7 +129,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/cmb/leader - name = "CMB - Colonial Marshal" + name = "Prop - UA - Marshal" paygrade = "GS-13" idtype = /obj/item/card/id/marshal role_comm_title = "CMB MAR" @@ -155,7 +155,7 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran, WEAR_HANDS) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert, WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/shotgun/large, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/handful/shotgun/buckshot, WEAR_IN_R_STORE) @@ -225,7 +225,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/cmb/liaison - name = "Prop - ICC Liaison" + name = "Prop - UA - ICC Liaison" paygrade = "GS-6" idtype = /obj/item/card/id/silver/cl role_comm_title = "ICC Rep." @@ -263,7 +263,7 @@ //*****************************************************************************************************/ /datum/equipment_preset/cmb/observer - name = "Prop - Human Rights Observer" + name = "Prop - UA - Human Rights Observer" paygrade = "GS-3" idtype = /obj/item/card/id/lanyard role_comm_title = "OBS" diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index 1315f7b3eb..4a73583f4d 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -10,18 +10,39 @@ skills = /datum/skills/civilian idtype = /obj/item/card/id/lanyard - minimap_icon = "surv" - minimap_background = MINIMAP_ICON_BACKGROUND_CIVILIAN +/datum/equipment_preset/colonist/load_name(mob/living/carbon/human/new_human, randomise) + new_human.gender = pick(MALE, FEMALE) + var/datum/preferences/A = new + A.randomize_appearance(new_human) + var/random_name = capitalize(pick(new_human.gender == MALE ? first_names_male : first_names_female)) + " " + capitalize(pick(last_names)) + var/static/list/colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "BROWN" = list(48, 38, 18),"BLUE" = list(29, 51, 65), "GREEN" = list(40, 61, 39), "STEEL" = list(46, 59, 54)) + var/static/list/hair_colors = list("BLACK" = list(15, 15, 10), "BROWN" = list(48, 38, 18), "AUBURN" = list(77, 48, 36), "BLONDE" = list(95, 76, 44)) + var/hair_color = pick(hair_colors) + new_human.r_hair = hair_colors[hair_color][1] + new_human.g_hair = hair_colors[hair_color][2] + new_human.b_hair = hair_colors[hair_color][3] + new_human.r_facial = hair_colors[hair_color][1] + new_human.g_facial = hair_colors[hair_color][2] + new_human.b_facial = hair_colors[hair_color][3] + var/eye_color = pick(colors) + new_human.r_eyes = colors[eye_color][1] + new_human.g_eyes = colors[eye_color][2] + new_human.b_eyes = colors[eye_color][3] + if(new_human.gender == MALE) + new_human.h_style = pick("Undercut", "Partly Shaved", "Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "Medium Fade", "High Fade", "Coffee House Cut") + new_human.f_style = pick("Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "Shaved", "3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) + else + new_human.h_style = pick("Side Undercut", "Side Hang Undercut (Reverse)", "Undercut, Top", "CIA", "CIA","Mulder", "Pixie Cut Left", "Pixie Cut Right", "Bun") + new_human.change_real_name(new_human, random_name) + new_human.age = rand(20,35) /datum/equipment_preset/colonist/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) - new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) - new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/offwhite(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) -/datum/equipment_preset/survivor/load_id(mob/living/carbon/human/new_human, client/mob_client) +/datum/equipment_preset/colonist/load_id(mob/living/carbon/human/new_human, client/mob_client) var/obj/item/clothing/under/uniform = new_human.w_uniform if(istype(uniform)) uniform.has_sensor = UNIFORM_HAS_SENSORS @@ -30,64 +51,148 @@ //*****************************************************************************************************/ -/datum/equipment_preset/colonist/engineer - name = "Colonist - Engineer" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "Colonial Engineer" - - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING) - skills = /datum/skills/OT - -/datum/equipment_preset/colonist/engineer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/cyan(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/eng(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/yellow(new_human), WEAR_HANDS) - - new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) - new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) - -//*****************************************************************************************************/ - -/datum/equipment_preset/colonist/security - name = "Colonist - Security" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "Colonial Security" - - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_RESEARCH) - skills = /datum/skills/MP +/datum/equipment_preset/colonist/prisoner + name = "Prop - Prison - Inmate" + assignment = "Low Risk Inmate" + skills = /datum/skills/civilian + flags = EQUIPMENT_PRESET_START_OF_ROUND + access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/colonist/security/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/survivor/prisoner/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/prison(new_human), WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/security(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/sec(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/prison(new_human), WEAR_FEET) + ..() + +/datum/equipment_preset/colonist/prisoner/skilled + name = "Prop - Prison - Inmate, Dangerous" + assignment = "High Risk Inmate" + skills = /datum/skills/civilian/survivor/prisoner + flags = EQUIPMENT_PRESET_START_OF_ROUND + access = list(ACCESS_CIVILIAN_PUBLIC) - new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) - new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) +/datum/equipment_preset/survivor/prisoner/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/prison(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/prison(new_human), WEAR_FEET) + ..() //*****************************************************************************************************/ +/datum/equipment_preset/colonist/urban/poor + name = "Prop - Colonist - Blue-collar" + +/datum/equipment_preset/colonist/urban/poor/New() + var/random_assignment = rand(0,1) + switch(random_assignment) + if(0) + assignment = "Class D Inhabitant" + if(1) + assignment = "Class C Inhabitant" + +/datum/equipment_preset/colonist/urban/poor/New() + skills = /datum/skills/civilian + flags = EQUIPMENT_PRESET_START_OF_ROUND + access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/colonist/doctor - name = "Colonist - Doctor" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "Colonial Doctor" - - //Marine access is required to use chem dispensers... - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE) - skills = /datum/skills/doctor - -/datum/equipment_preset/colonist/doctor/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) +/datum/equipment_preset/survivor/hybrisa/civilian/load_gear(mob/living/carbon/human/new_human) + + var/random_gear = rand(1,10) + switch(random_gear) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/bomber(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/grey(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/windbreaker_green(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light(new_human), WEAR_BACK) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/hybrisa/polyester_jacket_brown(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/green(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/hybrisa/polyester_jacket_blue(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + if(6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/snow_suit/hybrisa/polyester_jacket_red(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + if(7) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/ferret(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/grey(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/khaki(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + if(8) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear/pink(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/eng(new_human), WEAR_BACK) + if(9) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/trucker/red(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/bomber/red(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) + if(10) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beanie/royal_marine(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/bomber/alt(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/wy_joliet_shopsteward(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack(new_human), WEAR_BACK) + +// Office Workers + +/datum/equipment_preset/survivor/hybrisa/civilian_office + name = "Prop - Colonist - White-collar" + assignment = "Class B Inhabitant" + skills = /datum/skills/civilian/survivor + flags = EQUIPMENT_PRESET_START_OF_ROUND + access = list(ACCESS_CIVILIAN_PUBLIC) - new_human.equip_to_slot(new /obj/item/attachable/bayonet(new_human), WEAR_L_STORE) - new_human.equip_to_slot(new /obj/item/device/flashlight(new_human), WEAR_R_STORE) + survivor_variant = CIVILIAN_SURVIVOR + +/datum/equipment_preset/survivor/hybrisa/civilian_office/load_gear(mob/living/carbon/human/new_human) + + var/random_gear = rand(1,6) + switch(random_gear) + if(1) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/black(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + if(2) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/black(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist/workwear(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + if(3) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/suspenders(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) + if(4) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/brown(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup/brown(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) + if(5) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/wcoat(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/det/slob(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) + if(6) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/marine/corporate/blue(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/liaison_suit/blazer(new_human), WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(new_human), WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/blue(new_human), WEAR_BACK) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 97a3fb2a88..b5e38aa7a8 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -14,7 +14,6 @@ . = ..() access = get_access(ACCESS_LIST_WY_PMC) - /datum/equipment_preset/pmc/load_name(mob/living/carbon/human/new_human, randomise) new_human.gender = pick(MALE,FEMALE) var/random_name @@ -353,125 +352,6 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) -/datum/equipment_preset/pmc/doctor - name = "Weyland-Yutani PMC (Trauma Surgeon)" - flags = EQUIPMENT_PRESET_EXTRA - - assignment = JOB_PMC_DOCTOR - rank = JOB_PMC_DOCTOR - paygrade = "PMC-DOC" - role_comm_title = "TRI" - skills = /datum/skills/pmc/doctor - headset_type = /obj/item/device/radio/headset/distress/pmc/medic - -/datum/equipment_preset/pmc/doctor/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/leader, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_BACK) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pressurized_reagent_canister/oxycodone, WEAR_R_STORE) //surgery - -/datum/equipment_preset/pmc/technician - name = "Weyland-Yutani PMC (Corporate Technician)" - flags = EQUIPMENT_PRESET_EXTRA - - assignment = JOB_PMC_ENGINEER - rank = JOB_PMC_ENGINEER - paygrade = "PMC-TECH" - role_comm_title = "TEC" - skills = /datum/skills/pmc/engineer - headset_type = /obj/item/device/radio/headset/distress/pmc/cct - -/datum/equipment_preset/pmc/technician/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc, WEAR_FACE) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest/brown_vest, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc/light, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding/superior, WEAR_EYES) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/defenses/handheld/sentry/mini, WEAR_IN_BACK) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full, WEAR_R_STORE) - -/*****************************************************************************************************/ - -/datum/equipment_preset/pmc/director - name = "Weyland-Yutani PMC (Site Director)" - flags = EQUIPMENT_PRESET_EXTRA - - languages = ALL_HUMAN_LANGUAGES - - assignment = JOB_PMC_DIRECTOR - rank = JOB_PMC_DIRECTOR - paygrade = "PMC-DIR" - role_comm_title = "DIR" - skills = /datum/skills/pmc/director - headset_type = /obj/item/device/radio/headset/distress/pmc/command/director - -/datum/equipment_preset/pmc/director/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/ivory, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/jacket/ivory, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/pmc, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup, WEAR_FEET) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/lockable, WEAR_BACK) - - var/obj/item/storage/pouch/pistol/command/command_pouch = new(new_human) - command_pouch.desc = replacetext(command_pouch.desc, "Captains", "corporate PMC directors") - new_human.equip_to_slot_or_del(command_pouch, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/cotablet/pmc(new_human), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_IN_L_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - - var/obj/item/device/radio/headset/R = new_human.wear_l_ear - if(istype(R)) - R.volume = RADIO_VOLUME_CRITICAL - //*****************************************************************************************************/ /datum/equipment_preset/pmc/synth diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index 55615f8108..3a0b271104 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -115,8 +115,8 @@ new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine, WEAR_HEAD) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/royal_marine/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY) diff --git a/code/modules/gear_presets/survivors/misc.dm b/code/modules/gear_presets/survivors/misc.dm index 07809dacb2..afdfdf1256 100644 --- a/code/modules/gear_presets/survivors/misc.dm +++ b/code/modules/gear_presets/survivors/misc.dm @@ -5,98 +5,6 @@ everything bellow isn't used or out of place. */ - -// ----- Prisioner Survivors -// after double check prisoner isn't being used anywhere. -/datum/equipment_preset/survivor/prisoner - name = "Prop - Prison - Inmate" - assignment = "High Sec " - skills = /datum/skills/civilian/survivor/prisoner - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/survivor/prisoner/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/prison(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) - if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human.back), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/prison(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/medium(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - ..() - -// after double check gangleader isn't being used anywhere. -/datum/equipment_preset/survivor/gangleader - name = "Survivor - Gang Leader" - assignment = "Gang Leader" - skills = /datum/skills/civilian/survivor/gangleader - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/gangleader/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/prison(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) - if(prob(50)) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human.back), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - ..() - -// ----- Civilian Survivor - -// after double check civilian isn't being used anywhere. -/datum/equipment_preset/survivor/civilian - name = "Survivor - Civilian" - assignment = "Civilian" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/civilian/load_gear(mob/living/carbon/human/new_human) - var/random_gear = rand(0, 3) - switch(random_gear) - if(0) // Normal Colonist - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - if(1) // Janitor - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/janitor(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/vir(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/purple(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/mgoggles(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/purple(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/galoshes(new_human), WEAR_FEET) - if(2) // Bar Tender - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/waiter(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/lawyer/bluejacket(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/bowlerhat(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/fake_mustache(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/beer_pack(new_human.back), WEAR_IN_BACK) - if(3) // Botanist - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/hyd(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/hatchet(new_human.back), WEAR_IN_BACK) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - - ..() - // ----- Mercenary Survivors // after double check pmc/miner/one isn't being used anywhere. @@ -140,49 +48,6 @@ everything bellow isn't used or out of place. ..() -// after double check /new_varadero/commander isn't being used anywhere. -/datum/equipment_preset/survivor/new_varadero/commander - name = "Survivor - USASF Commander" - assignment = "USASF Commander" - skills = /datum/skills/commander - paygrade = "NO5" - idtype = /obj/item/card/id/gold - role_comm_title = "USASF CDR" - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/survivor/new_varadero/commander/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/service(new_human), WEAR_BODY) - - var/obj/item/clothing/suit/storage/jacket/marine/service/suit = new() - suit.icon_state = "[suit.initial_icon_state]_o" - suit.buttoned = FALSE - - var/obj/item/clothing/accessory/ranks/navy/o5/pin = new() - suit.attach_accessory(new_human, pin) - - new_human.equip_to_slot_or_del(suit, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/survival/full(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/notepad(new_human), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/pen/fountain(new_human), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/metal/med_small_stack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) - - ..() - // ----- Hostile Survivors /* diff --git a/code/modules/gear_presets/survivors/survivors.dm b/code/modules/gear_presets/survivors/survivors.dm index c98230367a..19a9906b79 100644 --- a/code/modules/gear_presets/survivors/survivors.dm +++ b/code/modules/gear_presets/survivors/survivors.dm @@ -39,398 +39,3 @@ uniform.has_sensor = UNIFORM_NO_SENSORS uniform.sensor_faction = FACTION_COLONIST return ..() - -/* -From map_config.dm - -Standart Survivors : /datum/equipment_preset/survivor/scientist, - /datum/equipment_preset/survivor/doctor, - /datum/equipment_preset/survivor/chef, - /datum/equipment_preset/survivor/chaplain, - /datum/equipment_preset/survivor/miner, - /datum/equipment_preset/survivor/colonial_marshal, - /datum/equipment_preset/survivor/engineer, - -*/ - - -// 1 ----- Scientist Survivor - -/datum/equipment_preset/survivor/scientist - name = "Survivor - Scientist" - assignment = "Scientist" - skills = /datum/skills/civilian/survivor/scientist - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/silver/clearance_badge/scientist - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) - - survivor_variant = SCIENTIST_SURVIVOR - -/datum/equipment_preset/survivor/scientist/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/virologist(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/surgery/green(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat/virologist(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/green(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/science(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/chem(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/green(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/paper/research_notes/good(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/glass/beaker/vial/random/good(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - add_random_survivor_research_gear(new_human) - - ..() - -// 2 ----- Doctor Survivor - -/datum/equipment_preset/survivor/doctor - name = "Survivor - Doctor" - assignment = "Doctor" - skills = /datum/skills/civilian/survivor/doctor - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/silver/clearance_badge - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND) - - survivor_variant = MEDICAL_SURVIVOR - -/datum/equipment_preset/survivor/doctor/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/medical(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/med(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/latex(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/surgical(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) - var/random_gear = rand(0,4) - switch(random_gear) - if(0) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_R_STORE) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medical/full(new_human), WEAR_R_STORE) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full(new_human), WEAR_R_STORE) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/first_responder/full(new_human), WEAR_R_STORE) - if(4) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/medkit/full_advanced(new_human), WEAR_R_STORE) - add_random_survivor_medical_gear(new_human) - add_survivor_weapon_civilian(new_human) - - ..() - -// 3 ----- Chef Survivor - -/datum/equipment_preset/survivor/chef - name = "Survivor - Chef" - assignment = "Chef" - skills = /datum/skills/civilian/survivor/chef - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/chef/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/chef(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/kitchen/rollingpin(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - - ..() - -// 4 ----- Chaplain Survivor - -/datum/equipment_preset/survivor/chaplain - name = "Survivor - Chaplain" - assignment = "Chaplain" - skills = /datum/skills/civilian/survivor/chaplain - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/datum/equipment_preset/survivor/chaplain/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/chaplain(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/holidaypriest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/bible/booze(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general(new_human), WEAR_R_STORE) - add_survivor_weapon_civilian(new_human) - - ..() - -// 5 ----- Miner Survivor - -/datum/equipment_preset/survivor/miner - name = "Survivor - Miner" - assignment = "Miner" - skills = /datum/skills/civilian/survivor/miner - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS) - -/datum/equipment_preset/survivor/miner/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/miner(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/norm(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/pickaxe(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/orange(new_human), WEAR_HEAD) - add_survivor_weapon_civilian(new_human) - - ..() - -// 6 ---- Colonial Marshal Survivor - -/datum/equipment_preset/survivor/colonial_marshal - name = "Survivor - Colonial Marshal Deputy" - assignment = "CMB Deputy" - paygrade = "GS-9" - skills = /datum/skills/civilian/survivor/marshal - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/deputy - role_comm_title = "CMB DEP" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/survivor/colonial_marshal/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/CM_uniform(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/CMB(new_human), WEAR_HEAD) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/cmb(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_R_STORE) - add_survivor_weapon_security(new_human) - - ..() - -// 7 ----- Engineering Survivor - -/datum/equipment_preset/survivor/engineer - name = "Survivor - Engineer" - assignment = "Engineer" - skills = /datum/skills/civilian/survivor/engineer - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_ENGINEERING,ACCESS_CIVILIAN_LOGISTICS) - - survivor_variant = ENGINEERING_SURVIVOR - -/datum/equipment_preset/survivor/engineer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/cyan(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/largetank(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/sheet/plasteel/med_small_stack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/welding(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/utility/full(new_human), WEAR_WAIST) - add_survivor_weapon_civilian(new_human) - - ..() -/* -Everything bellow is a parent used as a base for one or multiple maps. -*/ - -// ----- Interstellar Human Rights Survivor - -// it's used as a base for soro map. -/datum/equipment_preset/survivor/interstellar_human_rights_observer - name = "Survivor - Interstellar Human Rights Observer" - assignment = "Interstellar Human Rights Observer(Colony)" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_COMMAND) - -/datum/equipment_preset/survivor/interstellar_human_rights_observer/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/brown(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - add_random_cl_survivor_loot(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) - add_survivor_weapon_civilian(new_human) - - ..() - - -// ----- CL Survivor -//used as a base for shiva and solaris spawn. - -/datum/equipment_preset/survivor/corporate - name = "Survivor - Corporate Liaison" - assignment = "Corporate Liaison" - skills = /datum/skills/civilian/survivor - flags = EQUIPMENT_PRESET_START_OF_ROUND - paygrade = "WYC2" - idtype = /obj/item/card/id/silver/clearance_badge/cl - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_EXEC, - ) - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - - survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/survivor/corporate/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/field(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - add_random_cl_survivor_loot(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(new_human), WEAR_FEET) - add_survivor_weapon_civilian(new_human) - - ..() - -/datum/equipment_preset/survivor/corporate/load_rank(mob/living/carbon/human/new_human) - if(new_human.client) - var/playtime = get_job_playtime(new_human.client, JOB_CORPORATE_LIAISON) - if(new_human.client.prefs.playtime_perks) - if(playtime > JOB_PLAYTIME_TIER_4) - return "WYC5" - else if(playtime > JOB_PLAYTIME_TIER_3) - return "WYC4" - else if(playtime > JOB_PLAYTIME_TIER_2) - return "WYC3" - else - return paygrade - return paygrade - -// ----- Security Survivor -/* - -present in xenomorph.dm file - -var/list/survivor_types = list( - /datum/equipment_preset/survivor/scientist, - /datum/equipment_preset/survivor/doctor, - /datum/equipment_preset/survivor/security, - /datum/equipment_preset/survivor/engineer - ) - -and is used as a base for all of the maps. - -*/ - -/datum/equipment_preset/survivor/security - name = "Survivor - Security" - assignment = "Security" - skills = /datum/skills/civilian/survivor/marshal - flags = EQUIPMENT_PRESET_START_OF_ROUND - idtype = /obj/item/card/id/data - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_BRIG,ACCESS_CIVILIAN_COMMAND) - - survivor_variant = SECURITY_SURVIVOR - -/datum/equipment_preset/survivor/security/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/security(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/security(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet(new_human), WEAR_HEAD) - if(new_human.disabilities & NEARSIGHTED) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud/prescription(new_human), WEAR_EYES) - else - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine(new_human), WEAR_R_STORE) - add_survivor_weapon_security(new_human) - ..() - -// ---- Trucker Survivor - -// it's used as a base for kutjevo lv nv solaris and trijent maps. -/datum/equipment_preset/survivor/trucker - name = "Survivor - Trucker" - assignment = "Trucker" - skills = /datum/skills/civilian/survivor/trucker - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC,ACCESS_CIVILIAN_ENGINEERING,ACCESS_CIVILIAN_LOGISTICS) - - survivor_variant = ENGINEERING_SURVIVOR - -/datum/equipment_preset/survivor/trucker/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/overalls(new_human), WEAR_BODY) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/soft/yellow(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/hardpoint/locomotion/van_wheels(new_human), WEAR_R_HAND) - add_survivor_weapon_civilian(new_human) - - ..() - -// ----- CL Survivor - -//this is used as a base for corsat and nv -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason - name = "Survivor - Interstellar Commerce Commission Liaison" - assignment = "Interstellar Commerce Commission Corporate Liaison" - skills = /datum/skills/civilian/survivor - idtype = /obj/item/card/id/silver/cl - paygrade = "WYC2" - role_comm_title = "ICC Rep." - flags = EQUIPMENT_PRESET_START_OF_ROUND - - survivor_variant = CORPORATE_SURVIVOR - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/New() - . = ..() - access = get_access(ACCESS_LIST_CIVIL_LIAISON) - -/datum/equipment_preset/survivor/interstellar_commerce_commission_liason/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CMB/limited(new_human), WEAR_L_EAR) - - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - add_ice_colony_survivor_equipment(new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/hazardvest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/centcom(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat/white(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/insulated(new_human), WEAR_HANDS) - add_survivor_weapon_civilian(new_human) - add_random_cl_survivor_loot(new_human) - - ..() diff --git a/code/modules/gear_presets/whiteout.dm b/code/modules/gear_presets/whiteout.dm index 82ba86e5e9..0f8ea696c8 100644 --- a/code/modules/gear_presets/whiteout.dm +++ b/code/modules/gear_presets/whiteout.dm @@ -65,12 +65,12 @@ new_human.equip_to_slot_or_del(armor, WEAR_JACKET) for(var/i in 1 to armor.storage_slots) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/heap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite/whiteout, WEAR_J_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1/heap, WEAR_J_STORE) //waist new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad, WEAR_WAIST) //limbs new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes.marine/civilian, WEAR_FEET) //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/rifle_heap, WEAR_L_STORE) @@ -78,97 +78,6 @@ var/obj/item/device/internal_implant/agility/implant = new() implant.on_implanted(new_human) -//*****************************************************************************************************/ - -/datum/equipment_preset/pmc/w_y_whiteout/medic - name = "Whiteout Team Medic" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "Whiteout Team Medic" - role_comm_title = "WO-TM" - -/datum/equipment_preset/pmc/w_y_whiteout/medic/load_gear(mob/living/carbon/human/new_human) - // back - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - //face - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/medhud, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) - //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) - //uniform - var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new() - var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(new_human, W) - new_human.equip_to_slot_or_del(M, WEAR_BODY) - for(var/i in 1 to W.hold.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_ACCESSORY) - //jacket - var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() - new_human.equip_to_slot_or_del(armor, WEAR_JACKET) - for(var/i in 1 to armor.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/heap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite/whiteout, WEAR_J_STORE) - //waist - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad, WEAR_WAIST) - //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) - //pockets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/smg_heap, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/smg_heap, WEAR_R_STORE) - - var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(new_human) - -//*****************************************************************************************************/ -/datum/equipment_preset/pmc/w_y_whiteout/terminator - name = "Whiteout Team Terminator (!DEATHSQUAD!)" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "Whiteout Team Terminator" - role_comm_title = "WO-TT" - -/datum/equipment_preset/pmc/w_y_whiteout/terminator/load_gear(mob/living/carbon/human/new_human) - //face - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) - //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/no_nightvision(new_human), WEAR_EYES) - //uniform - var/obj/item/clothing/under/marine/veteran/pmc/commando/M = new() - var/obj/item/clothing/accessory/storage/webbing/W = new() - M.attach_accessory(new_human, W) - new_human.equip_to_slot_or_del(M, WEAR_BODY) - for(var/i in 1 to W.hold.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) - //jacket - var/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc/terminator/armor = new() - new_human.equip_to_slot_or_del(armor, WEAR_JACKET) - for(var/i in 1 to armor.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/dirty/elite, WEAR_J_STORE) - //waist - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/whiteout/full, WEAR_WAIST) - //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) - //pockets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_L_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/whiteout, WEAR_EYES) - - var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(new_human) - //*****************************************************************************************************/ /datum/equipment_preset/pmc/w_y_whiteout/leader name = "Whiteout Team Leader (!DEATHSQUAD!)" @@ -217,182 +126,3 @@ var/obj/item/device/internal_implant/agility/implant = new() implant.on_implanted(new_human) - -//*****************************************************************************************************/ - -/datum/equipment_preset/pmc/w_y_whiteout/low_threat - name = "Whiteout Team Operative" - -/datum/equipment_preset/pmc/w_y_whiteout/low_threat/load_gear(mob/living/carbon/human/new_human) - // back - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/flamer_tank, WEAR_IN_BACK) - - - //face - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) - //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) - //uniform - var/obj/item/clothing/under/marine/veteran/pmc/commando/uniform = new() - var/obj/item/clothing/accessory/storage/webbing/accessory = new() - uniform.attach_accessory(new_human, accessory) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - for(var/i in 1 to accessory.hold.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) - //jacket - var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() - new_human.equip_to_slot_or_del(armor, WEAR_JACKET) - for(var/i in 1 to armor.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) - //waist - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad/standard, WEAR_WAIST) - //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) - //pockets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) - - var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(new_human) - -//*****************************************************************************************************/ - -/datum/equipment_preset/pmc/w_y_whiteout/low_threat/medic - name = "Whiteout Team Medic" - -/datum/equipment_preset/pmc/w_y_whiteout/low_threat/medic/load_gear(mob/living/carbon/human/new_human) - // back - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/upgraded, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/roller, WEAR_IN_BACK) - //face - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/medhud, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) - //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) - //uniform - var/obj/item/clothing/under/marine/veteran/pmc/commando/uniform = new() - var/obj/item/clothing/accessory/storage/webbing/accessory = new() - uniform.attach_accessory(new_human, accessory) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - for(var/i in 1 to accessory.hold.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_ACCESSORY) - //jacket - var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() - new_human.equip_to_slot_or_del(armor, WEAR_JACKET) - for(var/i in 1 to armor.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smg/m39/elite, WEAR_J_STORE) - //waist - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/flamer/deathsquad/standard, WEAR_WAIST) - //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) - //pockets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_m39, WEAR_R_STORE) - - var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(new_human) - -/datum/equipment_preset/pmc/w_y_whiteout/low_threat/terminator - name = "Whiteout Team Terminator" - -/datum/equipment_preset/pmc/w_y_whiteout/low_threat/terminator/load_gear(mob/living/carbon/human/new_human) - //face - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) - //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) - //uniform - var/obj/item/clothing/under/marine/veteran/pmc/commando/uniform = new() - var/obj/item/clothing/accessory/storage/webbing/accessory = new() - uniform.attach_accessory(new_human, accessory) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - for(var/i in 1 to accessory.hold.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) - //jacket - var/obj/item/clothing/suit/storage/marine/smartgunner/veteran/pmc/terminator/armor = new() - new_human.equip_to_slot_or_del(armor, WEAR_JACKET) - for(var/i in 1 to armor.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/dirty, WEAR_J_STORE) - //waist - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/smartgunner/pmc/full, WEAR_WAIST) - //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) - //pockets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sg, WEAR_L_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m56_goggles/whiteout, WEAR_EYES) - - var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(new_human) - -//*****************************************************************************************************/ -/datum/equipment_preset/pmc/w_y_whiteout/low_threat/leader - name = "Whiteout Team Leader" - -/datum/equipment_preset/pmc/w_y_whiteout/low_threat/leader/load_gear(mob/living/carbon/human/new_human) - // back - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/commando, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/nanopaste, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/synth, WEAR_IN_BACK) - //face - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/night/m42_night_goggles/m42c, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/leader, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/commando, WEAR_L_EAR) - //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/pmc/commando, WEAR_HEAD) - //uniform - var/obj/item/clothing/under/marine/veteran/pmc/commando/uniform = new() - var/obj/item/clothing/accessory/storage/webbing/accessory = new() - uniform.attach_accessory(new_human, accessory) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - for(var/i in 1 to accessory.hold.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/pmc, WEAR_IN_ACCESSORY) - //jacket - var/obj/item/clothing/suit/storage/marine/veteran/pmc/commando/armor = new() - new_human.equip_to_slot_or_del(armor, WEAR_JACKET) - for(var/i in 1 to armor.storage_slots) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/ap, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41a/elite, WEAR_J_STORE) - //waist - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/mateba/full, WEAR_WAIST) - //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc/commando, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/commando/knife, WEAR_FEET) - //pockets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_rifle, WEAR_R_STORE) - - var/obj/item/device/internal_implant/agility/implant = new() - implant.on_implanted(new_human) diff --git a/code/modules/gear_presets/wy.dm b/code/modules/gear_presets/wy.dm index f330225b4f..ff756946c8 100644 --- a/code/modules/gear_presets/wy.dm +++ b/code/modules/gear_presets/wy.dm @@ -6,7 +6,7 @@ rank = FACTION_WY idtype = /obj/item/card/id/silver faction_group = FACTION_LIST_WY - skills = /datum/skills/civilian + skills = /datum/skills/civilian/manager languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) var/headset_type = /obj/item/device/radio/headset/distress/WY @@ -46,7 +46,6 @@ assignment = JOB_DIVISION_MANAGER rank = JOB_DIVISION_MANAGER paygrade = "WYC8" - skills = /datum/skills/civilian/manager idtype = /obj/item/card/id/silver/clearance_badge/manager /datum/equipment_preset/wy/manager/New() @@ -77,6 +76,7 @@ paygrade = "WEY-GOON" access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_COMMAND, ACCESS_CIVILIAN_BRIG) languages = LANGUAGE_ENGLISH + skills = /datum/skills/civilian/security /datum/equipment_preset/wy/security/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/black(new_human), WEAR_BODY) @@ -88,5 +88,4 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(new_human), WEAR_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/highpower(new_human), WEAR_IN_R_STORE) new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/stack/medical/bruise_pack(new_human), WEAR_IN_BACK) diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 48918ef2ee..17ae6ed674 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -364,7 +364,7 @@ /obj/item/weapon/gun/rifle/m41aMK1 name = "\improper M41A pulse rifle" - desc = "Pulse action 10x24mm caseless assault rifle of the USCMC, personal friend of any Marine." + desc = "Pulse action 10x24mm caseless assault rifle of the USCMC painted in a fresh coat of Humbrol 170 camoflauge. A personal friend of every Marine." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m41amk1" //Placeholder. item_state = "m41amk1" //Placeholder. @@ -406,28 +406,23 @@ damage_mult = BASE_BULLET_DAMAGE_MULT + BULLET_DAMAGE_MULT_TIER_2 recoil_unwielded = RECOIL_AMOUNT_TIER_2 -/obj/item/weapon/gun/rifle/m41aMK1/ap //for making it start with ap loaded - current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap - /obj/item/weapon/gun/rifle/m41aMK1/unloaded //for making it start unloaded and with the safety on current_mag = null flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER|GUN_TRIGGER_SAFETY -/obj/item/weapon/gun/rifle/m41aMK1/tactical - starting_attachment_types = list(/obj/item/attachable/attached_gun/grenade/mk1, /obj/item/attachable/suppressor, /obj/item/attachable/magnetic_harness, /obj/item/attachable/stock/rifle/collapsible) +/obj/item/weapon/gun/rifle/m41aMK1/ap current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap -/obj/item/weapon/gun/rifle/m41aMK1/anchorpoint - desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel shotgun. Uses 10x24mm caseless ammunition." - starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/shotgun) - current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/ap +/obj/item/weapon/gun/rifle/m41aMK1/tactical + starting_attachment_types = list(/obj/item/attachable/attached_gun/grenade/mk1, /obj/item/attachable/suppressor, /obj/item/attachable/magnetic_harness, /obj/item/attachable/stock/rifle/collapsible) + current_mag = /obj/item/ammo_magazine/rifle/m41aMK1 -/obj/item/weapon/gun/rifle/m41aMK1/anchorpoint/gl - desc = "A classic M41 MK1 Pulse Rifle painted in a fresh coat of the classic Humbrol 170 camoflauge. This one appears to be used by the Colonial Marine contingent aboard Anchorpoint Station, and is equipped with an underbarrel grenade launcher. Uses 10x24mm caseless ammunition." +/obj/item/weapon/gun/rifle/m41aMK1/heap starting_attachment_types = list(/obj/item/attachable/stock/rifle/collapsible, /obj/item/attachable/attached_gun/grenade/mk1) + current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/heap /obj/item/weapon/gun/rifle/m41aMK1/forecon - desc = "Pulse action 10x24mm caseless assault rifle of the USCMC, personal friend of any Marine. This one is painted in a fresh coat of the newer Humbrol 76 camouflage and is used by Force Reconnaissance units." + desc = "Pulse action 10x24mm caseless assault rifle of the USCMC painted in a fresh coat of Humbrol 76 camoflauge denoting its ownership by a Force Reconnaissance unit." icon_state = "reconm41amk1" item_state = "reconm41amk1" current_mag = /obj/item/ammo_magazine/rifle/m41aMK1/recon diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi index d23a9aee73..c3c7bef668 100644 Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ diff --git a/icons/mob/humans/onmob/head-layer/head_marine.dmi b/icons/mob/humans/onmob/head-layer/head_marine.dmi index 5ae7151fbb..43f7fb4fab 100644 Binary files a/icons/mob/humans/onmob/head-layer/head_marine.dmi and b/icons/mob/humans/onmob/head-layer/head_marine.dmi differ diff --git a/icons/mob/humans/onmob/suit-layer/suit_0.dmi b/icons/mob/humans/onmob/suit-layer/suit_0.dmi index 3abfeab84f..c622528d21 100644 Binary files a/icons/mob/humans/onmob/suit-layer/suit_0.dmi and b/icons/mob/humans/onmob/suit-layer/suit_0.dmi differ diff --git a/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi b/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi index fbe2f1b742..10bed98008 100644 Binary files a/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi and b/icons/mob/humans/onmob/suit-layer/suit_civilian.dmi differ diff --git a/icons/mob/humans/onmob/suit-layer/suit_marine.dmi b/icons/mob/humans/onmob/suit-layer/suit_marine.dmi index 203d856bb7..8b5c33ca5d 100644 Binary files a/icons/mob/humans/onmob/suit-layer/suit_marine.dmi and b/icons/mob/humans/onmob/suit-layer/suit_marine.dmi differ diff --git a/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi b/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi index 9b5cd937c7..c86b9736fa 100644 Binary files a/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi and b/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi differ diff --git a/icons/obj/items/card.dmi b/icons/obj/items/card.dmi index fa026ac77c..6a57dc1dd3 100644 Binary files a/icons/obj/items/card.dmi and b/icons/obj/items/card.dmi differ