From b7191e9cb5a20a036511e498219923cec6d4cf48 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Mon, 5 Aug 2024 00:09:16 -0400 Subject: [PATCH] WIP --- code/datums/map_config.dm | 9 -- .../closets/secure/cm_closets.dm | 20 +--- .../crates_lockers/closets/secure/medical.dm | 19 ---- code/modules/client/preferences_gear.dm | 53 ---------- code/modules/clothing/gloves/marine_gloves.dm | 4 - code/modules/gear_presets/colonist.dm | 28 ++--- code/modules/gear_presets/corpses.dm | 18 +--- code/modules/gear_presets/pmc.dm | 1 - .../survivors/lv_522/forcon_survivors.dm | 97 ------------------ colonialmarines.dme | 1 - .../onmob/uniform-layer/uniform_marine.dmi | Bin 5777 -> 6165 bytes 11 files changed, 17 insertions(+), 233 deletions(-) delete mode 100644 code/modules/gear_presets/survivors/lv_522/forcon_survivors.dm 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 9b27575407e60a60a4b9e8efb678d04cda5b62cf..27fa51eb4666c87b01199a56561b340a85d9f0c6 100644 GIT binary patch delta 5994 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 delta 5630 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 brtrn7NM)}-rOyfe;tDxCxY}3Rdf)sXO20cT