diff --git a/code/datums/map_config.dm b/code/datums/map_config.dm index a568953aeb..31c62f2858 100644 --- a/code/datums/map_config.dm +++ b/code/datums/map_config.dm @@ -71,15 +71,6 @@ /datum/map_config/New() - synth_survivor_types = list( - /datum/equipment_preset/synth/survivor/medical_synth, - /datum/equipment_preset/synth/survivor/emt_synth, -, - /datum/equipment_preset/synth/survivor/wy/security_synth, - /datum/equipment_preset/synth/survivor/wy/protection_synth, - /datum/equipment_preset/synth/survivor/wy/corporate_synth, - ) - /proc/load_map_config(filename, default, delete_after, error_if_missing = TRUE) var/datum/map_config/config = new if(default) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm index dda5b187bb..58a1a8743d 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cm_closets.dm @@ -75,11 +75,7 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) /obj/structure/closet/secure_closet/staff_officer/intel/Initialize() . = ..() - new /obj/item/clothing/head/helmet/marine/rto/intel(src) - new /obj/item/clothing/shoes/marine(src) - new /obj/item/storage/backpack/marine/satchel/intel(src) - new /obj/item/device/motiondetector/intel(src) - new /obj/item/stack/fulton(src) + new /obj/item/device/motiondetector(src) /obj/structure/closet/secure_closet/staff_officer/intel/select_gamemode_equipment(gamemode) if (SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) @@ -100,10 +96,6 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) new /obj/item/clothing/head/helmet/marine/pilot(src) new /obj/item/clothing/suit/armor/vest/pilot(src) -/obj/structure/closet/secure_closet/pilot_officer/select_gamemode_equipment(gamemode) - if (SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) - new /obj/item/clothing/mask/rebreather/scarf(src) - //**********************Military Police Gear**************************/ /obj/structure/closet/secure_closet/military_police name = "military police's locker" @@ -242,13 +234,8 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) /obj/structure/closet/secure_closet/req_officer/Initialize() . = ..() - new /obj/item/device/radio/headset/almayer/qm(src) new /obj/item/clothing/under/boiler(src) - new /obj/item/clothing/shoes/marine(src) - new /obj/item/storage/belt/marine(src) - new /obj/item/clothing/head/cmcap/req(src) - new /obj/item/device/flashlight(src) - new /obj/item/storage/backpack/marine/satchel(src) + new /obj/item/clothing/head/cmcap/khaki(src) /obj/structure/closet/secure_closet/cargotech name = "Cargo Technician's Locker" @@ -262,11 +249,8 @@ GLOBAL_LIST_EMPTY(co_secure_boxes) /obj/structure/closet/secure_closet/cargotech/Initialize() . = ..() - new /obj/item/clothing/under/boiler(src) - new /obj/item/clothing/shoes/marine(src) new /obj/item/clothing/gloves/yellow(src) new /obj/item/clothing/head/beanie(src) - new /obj/item/storage/backpack/marine/satchel(src) return /obj/structure/closet/secure_closet/sea diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index d5f1539488..428c7d8bb8 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -87,26 +87,7 @@ /obj/structure/closet/secure_closet/CMO/Initialize() . = ..() - new /obj/item/clothing/suit/radiation(src) - new /obj/item/clothing/head/radiation(src) - new /obj/item/clothing/shoes/white(src) - new /obj/item/clothing/gloves/latex(src) - new /obj/item/clothing/under/medical/green(src) - new /obj/item/clothing/under/medical/blue(src) - new /obj/item/clothing/under/medical(src) new /obj/item/clothing/under/medical/purple(src) - new /obj/item/clothing/head/surgery/green(src) - new /obj/item/clothing/head/surgery/blue(src) - new /obj/item/clothing/head/surgery/purple(src) - new /obj/item/clothing/suit/storage/labcoat(src) - new /obj/item/clothing/mask/surgical(src) - new /obj/item/clothing/mask/breath(src) - new /obj/item/clothing/head/cmo(src) - new /obj/item/reagent_container/hypospray/tricordrazine(src) - new /obj/item/device/flash(src) - new /obj/item/storage/pouch/medical(src) - new /obj/item/storage/pouch/syringe(src) - new /obj/item/storage/pouch/medkit(src) if(is_mainship_level(z)) new /obj/item/device/radio/headset/almayer/cmo(src) return diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 9b8b319731..f44200c291 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -223,50 +223,6 @@ var/global/list/gear_datums_by_name = list() display_name = "USCM beanie, tan" path = /obj/item/clothing/head/beanie/tan -/datum/gear/headwear/uscm/beret_green - display_name = "USCM beret, green" - path = /obj/item/clothing/head/beret/cm - -/datum/gear/headwear/uscm/beret_tan - display_name = "USCM beret, tan" - path = /obj/item/clothing/head/beret/cm/tan - -/datum/gear/headwear/uscm/beret_black - display_name = "USCM beret, black" - path = /obj/item/clothing/head/beret/cm/black - -/datum/gear/headwear/uscm/beret_white - display_name = "USCM beret, white" - path = /obj/item/clothing/head/beret/cm/white - -/datum/gear/headwear/uscm/beret_alpha - display_name = "USCM beret, red flash" - path = /obj/item/clothing/head/beret/cm/alpha - -/datum/gear/headwear/uscm/beret_bravo - display_name = "USCM beret, yellow flash" - path = /obj/item/clothing/head/beret/cm/bravo - -/datum/gear/headwear/uscm/beret_charlie - display_name = "USCM beret, purple flash" - path = /obj/item/clothing/head/beret/cm/charlie - -/datum/gear/headwear/uscm/beret_delta - display_name = "USCM beret, blue flash" - path = /obj/item/clothing/head/beret/cm/delta - -/datum/gear/headwear/uscm/beret_echo - display_name = "USCM beret, green flash" - path = /obj/item/clothing/head/beret/cm/echo - -/datum/gear/headwear/uscm/beret_foxtrot - display_name = "USCM beret, brown flash" - path = /obj/item/clothing/head/beret/cm/foxtrot - -/datum/gear/headwear/uscm/beret_intel - display_name = "USCM beret, black flash" - path = /obj/item/clothing/head/beret/cm/intel - /datum/gear/headwear/uscm/boonie_olive display_name = "USCM boonie hat, olive" path = /obj/item/clothing/head/cmcap/boonie @@ -1020,11 +976,6 @@ var/global/list/gear_datums_by_name = list() path = /obj/item/clothing/shoes/marine/jungle cost = 2 -/datum/gear/misc/brown_boots - display_name = "brown combat boots" - path = /obj/item/clothing/shoes/marine/brown - cost = 2 - /datum/gear/misc/brown_gloves display_name = "brown combat gloves" path = /obj/item/clothing/gloves/marine/brown @@ -1052,10 +1003,6 @@ var/global/list/gear_datums_by_name = list() display_name = "Solar Devils shoulder patch" path = /obj/item/clothing/accessory/patch/devils -/datum/gear/misc/patch_uscm/falcon - display_name = "Falling Falcons shoulder patch" - path = /obj/item/clothing/accessory/patch/falcon - /datum/gear/misc/family_photo display_name = "Family photo" path = /obj/item/prop/helmetgarb/family_photo diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index 386d7d6514..1500065b83 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -54,7 +54,6 @@ armor_internaldamage = CLOTHING_ARMOR_VERYHIGH unacidable = TRUE flags_item = MOB_LOCK_ON_EQUIP|NO_CRYO_STORE - adopts_squad_color = FALSE /obj/item/clothing/gloves/marine/pve_mopp name = "\improper M2 MOPP gloves" @@ -82,7 +81,6 @@ desc = "A pair of fashionable white gloves, worn by marines in dress." icon_state = "white" item_state = "marine_white" - adopts_squad_color = FALSE /obj/item/clothing/gloves/marine/veteran/souto name = "\improper Souto Man gloves" @@ -99,7 +97,6 @@ armor_rad = CLOTHING_ARMOR_HARDCORE armor_internaldamage = CLOTHING_ARMOR_HARDCORE unacidable = TRUE - adopts_squad_color = FALSE /obj/item/clothing/gloves/marine/veteran/insulated/van_bandolier name = "custom shooting gloves" @@ -118,7 +115,6 @@ armor_rad = CLOTHING_ARMOR_VERYHIGH armor_internaldamage = CLOTHING_ARMOR_MEDIUM unacidable = TRUE - adopts_squad_color = FALSE /obj/item/clothing/gloves/marine/veteran/cbrn name = "\improper M3 MOPP gloves" diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index 27fc77e2fa..416446adfb 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -58,7 +58,7 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/prisoner/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/colonist/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) @@ -68,14 +68,6 @@ name = "Prop - Prison - Inmate, Dangerous" assignment = "High Risk Inmate" skills = /datum/skills/civilian/prisoner - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list(ACCESS_CIVILIAN_PUBLIC) - -/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 @@ -94,7 +86,7 @@ flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/hybrisa/civilian/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/colonist/urban/poor/load_gear(mob/living/carbon/human/new_human) var/random_gear = rand(1,10) switch(random_gear) @@ -113,7 +105,7 @@ 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(4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/gray(new_human), WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/blue(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(new_human), WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) @@ -131,16 +123,16 @@ // Office Workers -/datum/equipment_preset/survivor/hybrisa/civilian_office +/datum/equipment_preset/colonist/urban/rich name = "Prop - Colonist - White-collar" assignment = "Class B Inhabitant" - skills = /datum/skills/civilian/survivor + skills = /datum/skills/civilian flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) survivor_variant = CIVILIAN_SURVIVOR -/datum/equipment_preset/survivor/hybrisa/civilian_office/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/colonist/urban/rich/load_gear(mob/living/carbon/human/new_human) var/random_gear = rand(1,6) switch(random_gear) @@ -182,14 +174,14 @@ // Part-timers -/datum/equipment_preset/survivor/hybrisa/weymart +/datum/equipment_preset/colonist/weymart name = "Survivor - Colonist - Weymart Employee" assignment = "Hi! My name is:" skills = /datum/skills/civilian flags = EQUIPMENT_PRESET_START_OF_ROUND access = list(ACCESS_CIVILIAN_PUBLIC) -/datum/equipment_preset/survivor/hybrisa/weymart/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/colonist/weymart/load_gear(mob/living/carbon/human/new_human) var/random_gear = rand(1,3) switch(random_gear) if(1) @@ -210,11 +202,11 @@ // Utility Workers -/datum/equipment_preset/survivor/hybrisa/sanitation +/datum/equipment_preset/colonist/sanitation name = "Prop - Colonist - Sanitation Worker" assignment = "Material Reprocessing Technician" -/datum/equipment_preset/survivor/hybrisa/fire_fighter +/datum/equipment_preset/colonist/fire_fighter name = "Prop - Colonist - Firefighter" assignment = "Fire Protection Specialist" diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index df0f97e13b..12aabc3bc0 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -1,6 +1,6 @@ /datum/equipment_preset/corpse - name = "Corpse" + name = "Corpse - Colonist - Blue-collar" flags = EQUIPMENT_PRESET_EXTRA assignment = "Class C Inhabitant" rank = JOB_COLONIST @@ -73,7 +73,7 @@ new_human.pulse = PULSE_NONE /datum/equipment_preset/corpse/load_gear(mob/living/carbon/human/new_human) - var/random_gear = rand(1,10) + var/random_gear = rand(1,6) switch(random_gear) if(1) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/windbreaker/brown(new_human), WEAR_JACKET) @@ -106,10 +106,9 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel(new_human), WEAR_BACK) //*****************************************************************************************************/ -// Civilians /datum/equipment_preset/corpse/prisoner - name = "Corpse - Prisoner" + name = "Corpse - Prison - Inmate" assignment = "Prisoner" /datum/equipment_preset/corpse/prisoner/load_gear(mob/living/carbon/human/new_human) @@ -119,9 +118,8 @@ //*****************************************************************************************************/ /datum/equipment_preset/corpse/doctor - name = "Corpse - Doctor" + name = "Corpse - Colonist - Doctor" assignment = "Medical Doctor" - xenovictim = TRUE access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) /datum/equipment_preset/corpse/doctor/load_gear(mob/living/carbon/human/new_human) @@ -135,7 +133,6 @@ /datum/equipment_preset/corpse/engineer name = "Corpse - Engineer" assignment = "Station Engineer" - xenovictim = TRUE access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING) /datum/equipment_preset/corpse/engineer/load_gear(mob/living/carbon/human/new_human) @@ -150,8 +147,6 @@ 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/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/attachable/bayonet(new_human.back), WEAR_IN_BACK) - if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) add_ice_colony_survivor_equipment(new_human) @@ -337,10 +332,7 @@ /datum/equipment_preset/corpse/prison_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) - else - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) 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) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 108d452652..6a405c9ded 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -65,7 +65,6 @@ /datum/equipment_preset/pmc/pmc_standard/load_gear(mob/living/carbon/human/new_human) - var/choice = rand(1,5) 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/opfor/pmc, WEAR_BODY) if(prob(50)) diff --git a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm b/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm deleted file mode 100644 index 14f58366e3..0000000000 --- a/code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm +++ /dev/null @@ -1,97 +0,0 @@ -///*****************************LV-522 Force Recon Survivors*******************************************************/ -//Nanu told me to put them here so they dont clutter up survivors.dm -/datum/equipment_preset/survivor/forecon - paygrade = "ME5" - idtype = /obj/item/card/id/dogtag - role_comm_title = "FORECON" - rank = JOB_SURVIVOR - faction_group = list(FACTION_USCM, FACTION_SURVIVOR) - flags = EQUIPMENT_PRESET_START_OF_ROUND - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_LOGISTICS, - ) - -/datum/equipment_preset/survivor/forecon/load_gear(mob/living/carbon/human/new_human) - var/obj/item/clothing/under/marine = new() - var/obj/item/clothing/accessory/storage/droppouch/pouch = new() - var/obj/item/clothing/accessory/ranks/marine/e5/pin = new() - var/obj/item/clothing/accessory/patch/patch_uscm = new() - var/obj/item/clothing/accessory/patch/forecon/patch_forecon = new() - uniform.attach_accessory(new_human,pouch) - uniform.attach_accessory(new_human,patch_uscm) - uniform.attach_accessory(new_human,pin) - uniform.attach_accessory(new_human,patch_forecon) - new_human.equip_to_slot_or_del(uniform, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/forecon(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/satchel(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/flask/marine(new_human), WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/facepaint/sniper(new_human), WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/jungle/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof(new_human), WEAR_L_EAR) - GLOB.character_traits[/datum/character_trait/skills/spotter].apply_trait(new_human) - -/datum/equipment_preset/survivor/forecon/add_survivor_weapon_security(mob/living/carbon/human/new_human) - return - -/datum/equipment_preset/survivor/forecon/proc/add_forecon_weapon(mob/living/carbon/human/new_human) - var/random_gun = rand(1,3) - switch(random_gun) - if(1 , 2) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m41aMK1(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1(new_human), WEAR_IN_BACK) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m4ra/pve(new_human), WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra/pve(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m4ra/pve(new_human), WEAR_IN_BACK) - -/datum/equipment_preset/survivor/forecon/add_survivor_weapon_pistol(mob/living/carbon/human/new_human) - return - -/datum/equipment_preset/survivor/forecon/proc/add_forecon_weapon_pistol(mob/living/carbon/human/new_human) - var/random_pistol = rand(1,4) - switch(random_pistol) - if(1 , 2) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911/socom(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_BELT) - if(3 , 4) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/general_belt(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector(new_human),WEAR_IN_BELT) - -/datum/equipment_preset/survivor/forecon/add_random_survivor_equipment(mob/living/carbon/human/new_human) - return - -/datum/equipment_preset/survivor/forecon/proc/add_forecon_equipment(mob/living/carbon/human/new_human) - var/random_equipment = rand(1,3) - switch(random_equipment) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/device/walkman(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/cassette_tape/indie(new_human), WEAR_IN_BACK) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/toy/deck(new_human), WEAR_IN_ACCESSORY) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/lucky_strikes(new_human), WEAR_IN_ACCESSORY) - -/datum/equipment_preset/survivor/forecon/proc/spawn_random_headgear(mob/living/carbon/human/new_human) - var/i = rand(1,10) - switch(i) - if (1 , 2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) - if (3 , 4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie(new_human), WEAR_HEAD) - if (5 , 6) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/durag(new_human), WEAR_HEAD) - if (7 , 8) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap/boonie/tan(new_human), WEAR_HEAD) - if (9) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine(new_human), WEAR_HEAD) - - diff --git a/colonialmarines.dme b/colonialmarines.dme index a79b0dd53f..4d1b2c74c2 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1676,7 +1676,6 @@ #include "code\modules\gear_presets\wy.dm" #include "code\modules\gear_presets\yautja.dm" #include "code\modules\gear_presets\survivors\survivors.dm" -#include "code\modules\gear_presets\survivors\lv_522\forcon_survivors.dm" #include "code\modules\holidays\halloween\decorators.dm" #include "code\modules\holidays\halloween\pumpkins\patches.dm" #include "code\modules\holidays\halloween\pumpkins\wearable.dm" diff --git a/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi b/icons/mob/humans/onmob/uniform-layer/uniform_marine.dmi index 9b27575407..27fa51eb46 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