From 72548b81a752b95fdfd0500fca8e725f887d58b9 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Mon, 5 Aug 2024 01:28:02 -0400 Subject: [PATCH] WIP --- code/datums/supply_packs/black_market.dm | 12 +- .../vendor_types/antag/antag_clothing.dm | 41 -- .../vending/vendor_types/antag/antag_gear.dm | 109 ---- .../effects/landmarks/corpsespawner.dm | 95 --- code/modules/clothing/head/head.dm | 14 +- .../modules/gear_presets/_select_equipment.dm | 72 --- code/modules/gear_presets/clf.dm | 4 +- code/modules/gear_presets/contractor.dm | 112 +--- code/modules/gear_presets/corpses.dm | 577 +----------------- colonialmarines.dme | 3 - 10 files changed, 24 insertions(+), 1015 deletions(-) delete mode 100644 code/game/machinery/vending/vendor_types/antag/antag_clothing.dm delete mode 100644 code/game/machinery/vending/vendor_types/antag/antag_gear.dm diff --git a/code/datums/supply_packs/black_market.dm b/code/datums/supply_packs/black_market.dm index 358dbb81e5..8cb8c88730 100644 --- a/code/datums/supply_packs/black_market.dm +++ b/code/datums/supply_packs/black_market.dm @@ -1059,15 +1059,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro new /obj/item/reagent_container/food/drinks/bottle/rum(loc) loot_message = SPAN_NOTICE("It's a bunch of finished and unfinished molotovs.") // That was the good 50%. Now it's time for the bad. - if(41 to 50) - // Random junk - new /obj/effect/essentials_set/random/clf_bonus_item(loc) - new /obj/effect/essentials_set/random/clf_bonus_item(loc) - new /obj/effect/essentials_set/random/clf_bonus_item(loc) - new /obj/effect/essentials_set/random/clf_bonus_item(loc) - new /obj/effect/essentials_set/random/clf_bonus_item(loc) - loot_message = SPAN_NOTICE("It's a bunch of random junk...") - if(51 to 70) + if(41 to 70) new /obj/effect/spawner/random/bomb_supply(loc) new /obj/effect/spawner/random/bomb_supply(loc) new /obj/effect/spawner/random/toolbox(loc) @@ -1084,7 +1076,7 @@ Things that don't fit anywhere else. If they're meant for shipside use, they pro var/mob/living/carbon/human/corpse = new (loc) corpse.create_hud() //Need to generate hud before we can equip anything apparently... - var/corpse_type = pick(/datum/equipment_preset/corpse/clf/burst, /datum/equipment_preset/corpse/clf) + var/corpse_type = pick(/datum/equipment_preset/corpse/colonist, /datum/equipment_preset/corpse/prisoner) arm_equipment(corpse, corpse_type, TRUE, FALSE) // I didn't choose the shitcode life, the shitcode life chose me loot_message = SPAN_HIGHDANGER("IT'S A CORPSE!!") diff --git a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm b/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm deleted file mode 100644 index b04a9f5422..0000000000 --- a/code/game/machinery/vending/vendor_types/antag/antag_clothing.dm +++ /dev/null @@ -1,41 +0,0 @@ -//------------ADAPTIVE ANTAG CLOSET--------------- -//Spawn one of these bad boys and you will have a proper automated closet for CLF/UPP players (for now, more can be always added later) - -/obj/structure/machinery/cm_vending/clothing/antag - name = "\improper Suspicious Automated Equipment Rack" - desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various equipment." - icon_state = "antag_clothing" - req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) - req_access = null - - listed_products = list() - -/obj/structure/machinery/cm_vending/clothing/antag/Initialize() - . = ..() - vend_flags |= VEND_FACTION_THEMES - -/obj/structure/machinery/cm_vending/clothing/antag/get_listed_products(mob/user) - if(!user) - var/list/all_equipment = list() - var/list/presets = typesof(/datum/equipment_preset) - for(var/i in presets) - var/datum/equipment_preset/eq = new i - var/list/equipment = eq.get_antag_clothing_equipment() - if(LAZYLEN(equipment)) - all_equipment += equipment - qdel(eq) - return all_equipment - - if(!ishuman(user)) - return - var/mob/living/carbon/human/H = user - var/list/products_sets = list() - if(H.assigned_equipment_preset) - if(!(H.assigned_equipment_preset.type in listed_products)) - listed_products[H.assigned_equipment_preset.type] = H.assigned_equipment_preset.get_antag_clothing_equipment() - products_sets = listed_products[H.assigned_equipment_preset.type] - else - if(!(/datum/equipment_preset/clf in listed_products)) - listed_products[/datum/equipment_preset/clf] = GLOB.gear_path_presets_list[/datum/equipment_preset/clf].get_antag_clothing_equipment() - products_sets = listed_products[/datum/equipment_preset/clf] - return products_sets diff --git a/code/game/machinery/vending/vendor_types/antag/antag_gear.dm b/code/game/machinery/vending/vendor_types/antag/antag_gear.dm deleted file mode 100644 index 3e847b4919..0000000000 --- a/code/game/machinery/vending/vendor_types/antag/antag_gear.dm +++ /dev/null @@ -1,109 +0,0 @@ -//------------ADAPTIVE ANTAG GEAR VENDOR--------------- - -/obj/structure/machinery/cm_vending/gear/antag - name = "\improper Suspicious Automated Gear Rack" - desc = "While similar in function to ColMarTech automated racks, this one is clearly not of USCM origin. Contains various gear." - icon_state = "gear" - - req_one_access = list(ACCESS_ILLEGAL_PIRATE, ACCESS_UPP_GENERAL, ACCESS_CLF_GENERAL) - req_access = null - listed_products = list() - -/obj/structure/machinery/cm_vending/gear/antag/Initialize() - . = ..() - vend_flags |= VEND_FACTION_THEMES - -/obj/structure/machinery/cm_vending/gear/antag/get_listed_products(mob/user) - . = list() - if(!user) - var/list/all_equipment = list() - var/list/presets = typesof(/datum/equipment_preset) - for(var/i in presets) - var/datum/equipment_preset/eq = new i - var/list/equipment = eq.get_antag_gear_equipment() - if(LAZYLEN(equipment)) - all_equipment += equipment - qdel(eq) - return all_equipment - - var/mob/living/carbon/human/human = user - if(human.assigned_equipment_preset) - return human.assigned_equipment_preset.get_antag_gear_equipment() - else - var/datum/equipment_preset/default = new /datum/equipment_preset/clf - var/list/gear = default.get_antag_gear_equipment() - qdel(default) - return gear - -//--------------ESSENTIALS------------------------ - -/obj/effect/essentials_set/medic/upp - spawned_gear_list = list( - /obj/item/bodybag/cryobag, - /obj/item/device/defibrillator, - /obj/item/storage/firstaid/adv, - /obj/item/device/healthanalyzer, - /obj/item/roller, - /obj/item/tool/surgery/surgical_line, - /obj/item/tool/surgery/synthgraft, - ) - -/obj/effect/essentials_set/upp_heavy - spawned_gear_list = list( - /obj/item/weapon/gun/pkp, - /obj/item/ammo_magazine/pkp, - /obj/item/ammo_magazine/pkp, - ) - -/obj/effect/essentials_set/leader/upp - spawned_gear_list = list( - /obj/item/explosive/plastic, - /obj/item/device/binoculars/range, - /obj/item/map/current_map, - /obj/item/storage/box/zipcuffs, - ) - -/obj/effect/essentials_set/kit/svd - spawned_gear_list = list( - /obj/item/weapon/gun/rifle/sniper/svd, - /obj/item/ammo_magazine/sniper/svd, - /obj/item/ammo_magazine/sniper/svd, - /obj/item/ammo_magazine/sniper/svd, - ) - -/obj/effect/essentials_set/kit/custom_shotgun - spawned_gear_list = list( - /obj/item/weapon/gun/shotgun/merc, - /obj/item/ammo_magazine/shotgun/incendiary, - /obj/item/ammo_magazine/shotgun, - /obj/item/ammo_magazine/shotgun/flechette, - ) - -/obj/effect/essentials_set/kit/m60 - spawned_gear_list = list( - /obj/item/weapon/gun/m60, - /obj/item/ammo_magazine/m60, - /obj/item/ammo_magazine/m60, - ) - -/obj/effect/essentials_set/random/clf_bonus_item - spawned_gear_list = list( - /obj/item/storage/pill_bottle/tramadol/skillless, - /obj/item/storage/pill_bottle/tramadol/skillless, - /obj/item/storage/pill_bottle/tramadol/skillless, - /obj/item/tool/hatchet, - /obj/item/tool/hatchet, - /obj/item/weapon/twohanded/spear, - /obj/item/reagent_container/spray/pepper, - /obj/item/reagent_container/spray/pepper, - /obj/item/reagent_container/spray/pepper, - /obj/item/reagent_container/ld50_syringe/choral, - /obj/item/storage/bible, - /obj/item/clothing/mask/gas/pmc, - /obj/item/clothing/accessory/storage/holster, - /obj/item/clothing/accessory/storage/webbing, - /obj/item/storage/pill_bottle/happy, - /obj/item/storage/pill_bottle/happy, - /obj/item/storage/pill_bottle/happy, - /obj/item/explosive/grenade/smokebomb, - ) diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index bfdd903e38..08a74397ec 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -21,98 +21,3 @@ /obj/effect/landmark/corpsespawner/prisoner name = "Prisoner" equip_path = /datum/equipment_preset/corpse/prisoner - -/obj/effect/landmark/corpsespawner/doctor - name = "Doctor" - equip_path = /datum/equipment_preset/corpse/doctor - -/obj/effect/landmark/corpsespawner/engineer - name = "Engineer" - equip_path = /datum/equipment_preset/corpse/engineer - -/obj/effect/landmark/corpsespawner/scientist - name = "Scientist" - equip_path = /datum/equipment_preset/corpse/scientist - -/obj/effect/landmark/corpsespawner/miner - name = "Shaft Miner" - equip_path = /datum/equipment_preset/corpse/miner - -/obj/effect/landmark/corpsespawner/security - name = "Security" - equip_path = /datum/equipment_preset/corpse/security - -/obj/effect/landmark/corpsespawner/security/marshal - name = "Colonial Marshal" - equip_path = /datum/equipment_preset/corpse/security/marshal - -/obj/effect/landmark/corpsespawner/security/liaison - name = "Corporate Liaison" - equip_path = /datum/equipment_preset/corpse/security/liaison - -/obj/effect/landmark/corpsespawner/prison_security - name = "Prison Guard" - equip_path = /datum/equipment_preset/corpse/prison_security - -/////////////////Officers////////////////////// - -/obj/effect/landmark/corpsespawner/commander - name = "Commanding Officer" - equip_path = /datum/equipment_preset/corpse/commander - -/obj/effect/landmark/corpsespawner/wysec - name = "Weyland-Yutani Corporate Security Guard" - equip_path = /datum/equipment_preset/corpse/wysec - -///CM specific jobs/// - -/obj/effect/landmark/corpsespawner/ua_riot - name = "UA Officer" - equip_path = /datum/equipment_preset/corpse/ua_riot - -/obj/effect/landmark/corpsespawner/ua_riot/burst - name = "Burst UA Officer" - equip_path = /datum/equipment_preset/corpse/ua_riot/burst - -/obj/effect/landmark/corpsespawner/wy/manager - name = "Corporate Supervisor" - equip_path = /datum/equipment_preset/corpse/wy/manager - -/obj/effect/landmark/corpsespawner/wy/manager/burst - name = "Burst Corporate Supervisor" - equip_path = /datum/equipment_preset/corpse/ua_riot/burst - - -///////////Faction Specific Corpses////////////////////// - -/obj/effect/landmark/corpsespawner/clf - name = "Colonial Liberation Front Soldier" - equip_path = /datum/equipment_preset/corpse/clf - -/obj/effect/landmark/corpsespawner/clf/burst - name = "Burst Colonial Liberation Front Soldier" - equip_path = /datum/equipment_preset/corpse/clf/burst - -/obj/effect/landmark/corpsespawner/upp - name = "Union of Progressive Peoples Soldier" - equip_path = /datum/equipment_preset/corpse/upp - -/obj/effect/landmark/corpsespawner/upp/burst - name = "Burst Union of Progressive Peoples Soldier" - equip_path = /datum/equipment_preset/corpse/upp/burst - -/obj/effect/landmark/corpsespawner/pmc - name = "Weyland-Yutani PMC (Standard)" - equip_path = /datum/equipment_preset/corpse/pmc - -/obj/effect/landmark/corpsespawner/pmc/burst - name = "Burst Weyland-Yutani PMC (Standard)" - equip_path = /datum/equipment_preset/corpse/pmc/burst - -/obj/effect/landmark/corpsespawner/freelancer - name = "Freelancer Mercenary" - equip_path = /datum/equipment_preset/corpse/freelancer - -/obj/effect/landmark/corpsespawner/freelancer/burst - name = "Burst Freelancer Mercenary" - equip_path = /datum/equipment_preset/corpse/freelancer/burst diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index d526e9a097..5ce61d3109 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -360,7 +360,7 @@ desc = "Worn by officers of special units." icon = 'icons/obj/items/clothing/cm_hats.dmi' item_icons = list( - WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/head-layer/head_upp.dmi' ) icon_state = "ivan_beret" item_state = "ivan_beret" @@ -384,7 +384,7 @@ desc = "A dark cap enscribed with the powerful letters of 'MARSHAL' representing justice, authority, and protection in the outer rim. The laws of the Earth stretch beyond the Sol." icon = 'icons/obj/items/clothing/cm_hats.dmi' item_icons = list( - WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi' ) icon_state = "cmbcap" flags_armor_protection = BODY_FLAG_HEAD @@ -404,7 +404,7 @@ desc = "A sturdy freelancer's cap. More protective than it seems." icon = 'icons/obj/items/clothing/cm_hats.dmi' item_icons = list( - WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi' ) icon_state = "freelancer_cap" siemens_coefficient = 2 @@ -431,7 +431,7 @@ desc = "A large hood in service with some militias, meant for obscurity on the frontier. Offers some head protection due to the study fibers utilized in production." icon = 'icons/obj/items/clothing/cm_hats.dmi' item_icons = list( - WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi' ) icon_state = "rebel_hood" siemens_coefficient = 2 @@ -480,7 +480,7 @@ icon = 'icons/obj/items/clothing/cm_hats.dmi' flags_inv_hide = HIDETOPHAIR item_icons = list( - WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi' ) /obj/item/clothing/head/durag/black @@ -499,7 +499,7 @@ icon_state = "drillhat" icon = 'icons/obj/items/clothing/cm_hats.dmi' item_icons = list( - WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi' ) #undef HAT_GARB_RELAY_ICON_STATE @@ -558,7 +558,7 @@ icon = 'icons/obj/items/clothing/cm_hats.dmi' flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE item_icons = list( - WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' + WEAR_HEAD = 'icons/mob/humans/onmob/head_0.dmi' ) /obj/item/clothing/head/beret/royal_marine/team_leader diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 4b6a2d8df2..5f3580c54c 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -931,78 +931,6 @@ var/list/rebel_rifles = list( new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/m16(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/m16(new_human), WEAR_WAIST) - - -/////////////// Antag Vendor Equipment /////////////// -/datum/equipment_preset/proc/get_antag_clothing_equipment() - return list( - list("STANDARD EQUIPMENT (TAKE ALL)", 0, null, null, null), - list("CLF Shoes (Random)", 0, /obj/effect/essentials_set/random/clf_shoes, MARINE_CAN_BUY_SHOES, VENDOR_ITEM_MANDATORY), - list("CLF Uniform", 0, /obj/item/clothing/under/boiler/grey, MARINE_CAN_BUY_UNIFORM, VENDOR_ITEM_MANDATORY), - list("CLF Armor (Random)", 0, /obj/effect/essentials_set/random/clf_armor, MARINE_CAN_BUY_ARMOR, VENDOR_ITEM_MANDATORY), - list("CLF Gloves (Random)", 0, /obj/effect/essentials_set/random/clf_gloves, MARINE_CAN_BUY_GLOVES, VENDOR_ITEM_MANDATORY), - list("CLF Belt (Random)", 0, /obj/effect/essentials_set/random/clf_belt, MARINE_CAN_BUY_BELT, VENDOR_ITEM_MANDATORY), - list("CLF Head Gear (Random)", 0, /obj/effect/essentials_set/random/clf_head, MARINE_CAN_BUY_HELMET, VENDOR_ITEM_MANDATORY), - list("Headset", 0, /obj/item/device/radio/headset/distress/dutch, MARINE_CAN_BUY_EAR, VENDOR_ITEM_MANDATORY), - list("Flashlight", 0, /obj/item/device/flashlight, MARINE_CAN_BUY_MRE, VENDOR_ITEM_MANDATORY), - list("Combat Pack", 0, /obj/item/storage/backpack/lightpack, MARINE_CAN_BUY_BACKPACK, VENDOR_ITEM_MANDATORY), - - list("POUCHES (CHOOSE 2)", 0, null, null, null), - list("Bayonet Sheath", 0, /obj/item/storage/pouch/bayonet/upp, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Explosive Pouch", 0, /obj/item/storage/pouch/explosive, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Refillable Injectors)", 0, /obj/item/storage/pouch/firstaid/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("First-Aid Pouch (Splints, Gauze, Ointment)", 0, /obj/item/storage/pouch/firstaid/full/alternate, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("First-Aid Pouch (Pill Packets)", 0, /obj/item/storage/pouch/firstaid/full/pills, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Flare Pouch (Full)", 0, /obj/item/storage/pouch/flare/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED), - list("Large Magazine Pouch", 0, /obj/item/storage/pouch/magazine/large, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Medium General Pouch", 0, /obj/item/storage/pouch/general/medium, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Pistol Magazine Pouch", 0, /obj/item/storage/pouch/magazine/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR), - - list("ATTACHMENTS (CHOOSE 1)", 0, null, null, null), - list("Angled Grip", 0, /obj/item/attachable/angledgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Extended Barrel", 0, /obj/item/attachable/extended_barrel, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Gyroscopic Stabilizer", 0, /obj/item/attachable/gyro, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Laser Sight", 0, /obj/item/attachable/lasersight, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Masterkey Shotgun", 0, /obj/item/attachable/attached_gun/shotgun, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Recoil Compensator", 0, /obj/item/attachable/compensator, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Red-Dot Sight", 0, /obj/item/attachable/reddot, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Reflex Sight", 0, /obj/item/attachable/reflex, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Suppressor", 0, /obj/item/attachable/suppressor, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - list("Vertical Grip", 0, /obj/item/attachable/verticalgrip, MARINE_CAN_BUY_ATTACHMENT, VENDOR_ITEM_REGULAR), - - list("MASK (CHOOSE 1)", 0, null, null, null), - list("Gas Mask", 0, /obj/item/clothing/mask/gas, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR), - list("Heat Absorbent Coif", 0, /obj/item/clothing/mask/rebreather/scarf, MARINE_CAN_BUY_MASK, VENDOR_ITEM_REGULAR) - ) - -/datum/equipment_preset/proc/get_antag_gear_equipment() - return list( - list("ENGINEERING SUPPLIES", 0, null, null, null), - list("Entrenching Tool", 2, /obj/item/tool/shovel/etool, null, VENDOR_ITEM_RECOMMENDED), - list("Sandbags x25", 5, /obj/item/stack/sandbags_empty/half, null, VENDOR_ITEM_RECOMMENDED), - - list("SPECIAL AMMUNITION", 0, null, null, null), - list("M16 AP Magazine (5.56x45mm)", 10, /obj/item/ammo_magazine/rifle/m16/ap, null, VENDOR_ITEM_REGULAR), - list("MAR Extended Magazine (7.62x39mm)", 10, /obj/item/ammo_magazine/rifle/mar40/extended, null, VENDOR_ITEM_REGULAR), - list("Shotgun Incendiary Shells (Handful)", 15, /obj/item/ammo_magazine/handful/shotgun/incendiary, null, VENDOR_ITEM_REGULAR), - - list("EXPLOSIVES", 0, null, null, null), - list("EMP Grenade", 10, /obj/item/explosive/grenade/empgrenade, null, VENDOR_ITEM_REGULAR), - list("Improvised Explosive Device", 15, /obj/item/explosive/grenade/custom/ied, null, VENDOR_ITEM_REGULAR), - list("Improvised Firebomb", 10, /obj/item/explosive/grenade/incendiary/molotov, null, VENDOR_ITEM_REGULAR), - list("Incendiary IED", 15, /obj/item/explosive/grenade/custom/ied_incendiary, null, VENDOR_ITEM_REGULAR), - list("Improvised Phosphorus Bomb", 20, /obj/item/explosive/grenade/phosphorus/clf, null, VENDOR_ITEM_REGULAR), - list("Smoke Grenade", 5, /obj/item/explosive/grenade/smokebomb, null, VENDOR_ITEM_REGULAR), - - list("UTILITIES", 0, null, null, null), - list("Fire Extinguisher (Portable)", 5, /obj/item/tool/extinguisher/mini, null, VENDOR_ITEM_REGULAR), - list("Large General Pouch", 10, /obj/item/storage/pouch/general/large, null, VENDOR_ITEM_REGULAR), - list("Random Useful (Or Not) Item", 5, /obj/effect/essentials_set/random/clf_bonus_item, null, VENDOR_ITEM_REGULAR), - list("Shoulder Holster", 10, /obj/item/clothing/accessory/storage/holster, null, VENDOR_ITEM_REGULAR), - list("Webbing", 10, /obj/item/clothing/accessory/storage/webbing, null, VENDOR_ITEM_REGULAR) - ) - /datum/equipment_preset/proc/load_upp_shotgun(mob/living/carbon/human/new_human) var/random_shotgun = rand(1,3) switch(random_shotgun) diff --git a/code/modules/gear_presets/clf.dm b/code/modules/gear_presets/clf.dm index c891aecd82..8119724709 100644 --- a/code/modules/gear_presets/clf.dm +++ b/code/modules/gear_presets/clf.dm @@ -72,7 +72,7 @@ if(3) 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/offwhite(new_human), WEAR_BODY) - 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) if(4) 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/cyan(new_human), WEAR_BODY) @@ -84,7 +84,7 @@ if(6) 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/under/boiler/offwhite(new_human), WEAR_BODY) - 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) //*****************************************************************************************************/ /datum/equipment_preset/clf/sniper diff --git a/code/modules/gear_presets/contractor.dm b/code/modules/gear_presets/contractor.dm index 0fbf5fae9a..ee05f748c1 100644 --- a/code/modules/gear_presets/contractor.dm +++ b/code/modules/gear_presets/contractor.dm @@ -64,14 +64,13 @@ var/choice = rand(1,10) 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/tshirt/gray_blu, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear/blue, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) 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/helmet/marine, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_EYES) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian/brown, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_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/explosive/plastic/breaching_charge, WEAR_IN_BACK) @@ -81,7 +80,6 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE,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/box/attachments(new_human), WEAR_IN_BACK) switch(choice) if(1 to 3) // 30% @@ -161,7 +159,7 @@ /datum/equipment_preset/contractor/duty/heavy/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/tshirt/gray_blu, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/boiler/darkblue, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/webbing, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_ACCESSORY) @@ -173,7 +171,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) 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/helmet/marine, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/explosive, WEAR_R_STORE) @@ -189,7 +187,6 @@ new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/m15, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/mar40/lmg, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/attachments(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ @@ -206,7 +203,7 @@ /datum/equipment_preset/contractor/duty/medic/load_gear(mob/living/carbon/human/new_human) //clothing - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/w_br, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear, WEAR_BODY) new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/vest, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/surg_vest/equipped, WEAR_ACCESSORY) @@ -214,7 +211,7 @@ new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) 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/helmet/marine, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/civilian, 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/glasses/sunglasses/big, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine/tactical, WEAR_J_STORE) @@ -253,7 +250,7 @@ /datum/equipment_preset/contractor/duty/leader/load_gear(mob/living/carbon/human/new_human) //clothes 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/tshirt/r_bla, WEAR_BODY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/workwear, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/black_vest, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_ACCESSORY) @@ -267,7 +264,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/m1911/socom, WEAR_WAIST) 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/helmet/marine, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/sensor, WEAR_EYES) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/autoinjector/full, WEAR_L_STORE) @@ -286,96 +283,3 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/m717/hacked/contractor, 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/box/attachments, WEAR_IN_BACK) - -//*****************************************************************************************************/ -/datum/equipment_preset/contractor/duty/synth - name = "Military Contractor (Synthetic)" - paygrade = "VAI-S" - role_comm_title = "Syn" - flags = EQUIPMENT_PRESET_EXTRA - - assignment = "VAIPO Support Synthetic" - rank = JOB_CONTRACTOR_SYN - faction = FACTION_CONTRACTOR - languages = ALL_SYNTH_LANGUAGES - -/datum/equipment_preset/contractor/duty/synth/load_skills(mob/living/carbon/human/new_human) - new_human.set_skills(/datum/skills/synthetic) - new_human.allow_gun_usage = FALSE - -/datum/equipment_preset/contractor/duty/synth/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick(50;MALE,50;FEMALE) - var/datum/preferences/A = new() - A.randomize_appearance(new_human) - var/random_name - if(new_human.gender == MALE) - random_name = "[pick(first_names_male)]" - else - random_name = "[pick(first_names_female)]" - - if(new_human.gender == MALE) - new_human.f_style = pick("3 O'clock Shadow", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache") - - - new_human.change_real_name(new_human, random_name) - new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut") - var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) - var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) - 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] - -/datum/equipment_preset/contractor/duty/synth/load_race(mob/living/carbon/human/new_human) - new_human.set_species(SYNTH_GEN_THREE) - -/datum/equipment_preset/contractor/duty/synth/load_gear(mob/living/carbon/human/new_human) - load_name(new_human) - //back - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/marine/smartpack/black, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator, WEAR_IN_BACK) //1 - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) //2 - new_human.equip_to_slot_or_del(new /obj/item/roller, 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/storage/box/packet/smoke, WEAR_IN_BACK) - //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/glasses/night/experimental_mesons, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/big, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine, WEAR_HEAD) - //body - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/tshirt/r_bla, 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/clothing/accessory/holobadge/cord, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/light/synvest, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/weapon/telebaton, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector/hacked/contractor, WEAR_J_STORE) - //waist - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/full/dutch, WEAR_WAIST) - //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - 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/weapon/twohanded/breacher/synth, WEAR_L_HAND) - //póckets - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/construction/full_barbed_wire, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/tools/tactical, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/screwdriver/tactical, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters/tactical, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/wrench, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/stack/cable_coil, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/multitool, WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool/hugetank, WEAR_IN_R_STORE) - -//*****************************************************************************************************/ diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index 16f4b4a57c..451bb1bd56 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -105,6 +105,9 @@ 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) +/datum/equipment_preset/corpse/colonist/burst + name = "Corpse - Colonist - Blue-collar - Burst" + xenovictim = TRUE //*****************************************************************************************************/ /datum/equipment_preset/corpse/prisoner @@ -115,577 +118,7 @@ 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/clothing/shoes/prison(new_human), WEAR_FEET) -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/doctor - name = "Corpse - Colonist - Doctor" - assignment = "Medical Doctor" - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) - -/datum/equipment_preset/corpse/doctor/load_gear(mob/living/carbon/human/new_human) - 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/under/medical/blue(new_human), WEAR_BODY) - 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/clothing/shoes/laceup(new_human), WEAR_FEET) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/engineer - name = "Corpse - Engineer" - assignment = "Station Engineer" - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING) - -/datum/equipment_preset/corpse/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) - 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/storage/belt/utility/full(new_human), WEAR_WAIST) - 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(new_human), WEAR_IN_BACK) - 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) - - 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/clothing/shoes/marine/knife(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight/lantern(new_human.back), WEAR_IN_BACK) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/scientist - name = "Corpse - Scientist" - assignment = "Scientist" - xenovictim = TRUE - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_MEDBAY) - -/datum/equipment_preset/corpse/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) - 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/storage/backpack/satchel(new_human), WEAR_BACK) - 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/device/radio/headset/distress(new_human), WEAR_L_EAR) - 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/device/radio(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/motiondetector(new_human), WEAR_IN_BACK) - 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) - 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/clothing/suit/storage/labcoat(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) - 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) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/miner - name = "Corpse - Shaft Miner" - assignment = "Shaft Miner" - xenovictim = TRUE - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_ENGINEERING) - -/datum/equipment_preset/corpse/miner/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/colonist(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/clothing/gloves/black(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/industrial(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(new_human), WEAR_FEET) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/security - name = "Corpse - Security" - assignment = "Deputy" - xenovictim = TRUE - access = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND) - -/datum/equipment_preset/corpse/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/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) - 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/belt/security/MP/full(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - 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) - - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/security/marshal - name = "Corpse - Colonial Marshal" - assignment = "Colonial Marshal" - xenovictim = TRUE - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/corpse/security/marshal/load_gear(mob/living/carbon/human/new_human) - - 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/under/CM_uniform(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/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) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/heavy(new_human), WEAR_WAIST) - 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/attachable/bayonet(new_human.back), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/radio(new_human), WEAR_IN_BACK) - - . = ..() - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/security/liaison - name = "Corpse - Corporate Liaison" - assignment = "Corporate Liaison" +/datum/equipment_preset/corpse/prisoner/burst + name = "Corpse - Prison - Inmate" xenovictim = TRUE - paygrade = "WYC2" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/corpse/security/liaison/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) - 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/clothing/suit/armor/vest(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/mod88(new_human), WEAR_WAIST) - 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) - 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/attachable/bayonet(new_human.back), WEAR_IN_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) - 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/attachable/bayonet(new_human.back), WEAR_IN_BACK) - . = ..() - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/prison_security - name = "Corpse - Prison Guard" - assignment = "Prison Guard" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/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) - 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) - 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) - //*****************************************************************************************************/ - -/datum/equipment_preset/corpse/commander - name = "Corpse - Commanding Officer" - idtype = /obj/item/card/id/general - assignment = "Commanding Officer" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/corpse/commander/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/centcom_commander(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/clothing/suit/armor/bulletproof(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/eyepatch(new_human), WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/cigarette/cigar/cohiba(new_human), WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/centhat(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/tool/lighter/zippo(new_human), WEAR_R_STORE) - add_random_cl_survivor_loot(new_human) - -//*****************************************************************************************************/ - -/datum/equipment_preset/corpse/wysec - name = "Corpse - Weyland-Yutani Corporate Security Guard" - idtype = /obj/item/card/id/pmc - assignment = "W-Y Corporate Security" - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_SECURITY, - ACCESS_WY_COLONIAL, - ACCESS_WY_GENERAL, - ) - -/datum/equipment_preset/corpse/wysec/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) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/black(new_human), WEAR_ACCESSORY) - 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/pouch/general/medium(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower(new_human), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/highpower(new_human), WEAR_IN_L_STORE) - 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) - -/////Actually specific colonists - -/datum/equipment_preset/corpse/colonist/burst - name = "Corpse - Burst Colonist" - xenovictim = TRUE - -/datum/equipment_preset/corpse/colonist/random - name = "Corpse - Colonist Random" - assignment = JOB_COLONIST - xenovictim = FALSE - rank = JOB_COLONIST - faction = FACTION_COLONIST - access = list(ACCESS_CIVILIAN_PUBLIC) - idtype = /obj/item/card/id/lanyard - -//UA riot control dudes -/datum/equipment_preset/corpse/ua_riot - name = "Corpse - UA Officer" - assignment = "United Americas Riot Officer" - idtype = /obj/item/card/id/silver - xenovictim = FALSE - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ) - -/datum/equipment_preset/corpse/ua_riot/load_gear(mob/living/carbon/human/new_human) - var/random = rand(1,5) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/ua_riot(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/storage/backpack/satchel/black, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine(new_human), WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/ua_riot(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/ua_riot(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/pmc(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/prop/helmetgarb/riot_shield(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/weapon/classic_baton(new_human), WEAR_WAIST) - - switch(random) - if(1) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/security, WEAR_EYES) - if(2) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses(new_human), WEAR_EYES) - if(3) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/aviator(new_human), WEAR_EYES) - if(4) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/sunglasses/sechud(new_human), WEAR_EYES) - if(5) - new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive/frag(new_human), WEAR_IN_BACK) - - -/datum/equipment_preset/corpse/ua_riot/burst - name = "Corpse - Burst UA Officer" - xenovictim = TRUE - -//Colonial Supervisor Corpse - -/datum/equipment_preset/corpse/wy/manager - name = "Corpse - Corporate Supervisor" - flags = EQUIPMENT_PRESET_EXTRA - paygrade = "WYC7" - assignment = "Colony Supervisor" - role_comm_title = "Supervisor" - rank = FACTION_WY - idtype = /obj/item/card/id/silver/clearance_badge/manager - faction_group = FACTION_LIST_WY - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - access = list( - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_LEADERSHIP, - ACCESS_WY_SECURITY, - ACCESS_WY_EXEC, - ACCESS_WY_RESEARCH, - ACCESS_WY_ENGINEERING, - ACCESS_WY_MEDICAL, - ACCESS_ILLEGAL_PIRATE, - ) - -/datum/equipment_preset/corpse/wy/manager/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/ivory(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/storage/backpack/satchel/lockable/liaison, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/businesswear/black(new_human), WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/WY, WEAR_L_EAR) - 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/clothing/head/manager(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/m4a3/vp78(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/attachable/bayonet(new_human.back), 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/pouch/tools/full(new_human), WEAR_R_STORE) - add_random_cl_survivor_loot(new_human) - - -/datum/equipment_preset/corpse/wy/manager/burst - name = "Corpse - Burst Corporate Supervisor" - xenovictim = TRUE - -//Faction Specific Corpses - -/datum/equipment_preset/corpse/clf - name = "Corpse - Colonial Liberation Front Soldier" - assignment = "Colonial Liberation Front Soldier" - idtype = /obj/item/card/id/silver - xenovictim = FALSE - faction = FACTION_CLF - -/datum/equipment_preset/corpse/clf/New() - . = ..() - access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) - -/datum/equipment_preset/corpse/clf/load_gear(mob/living/carbon/human/new_human) - - spawn_rebel_uniform(new_human) - spawn_rebel_suit(new_human) - spawn_rebel_helmet(new_human) - spawn_rebel_shoes(new_human) - spawn_rebel_gloves(new_human) - spawn_rebel_belt(new_human) - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/CLF(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar(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/pouch/tools/full(new_human), WEAR_R_STORE) - add_random_survivor_equipment(new_human) - add_pmc_survivor_weapon(new_human) - add_survivor_weapon_pistol(new_human) - -/datum/equipment_preset/corpse/clf/burst - name = "Corpse - Burst Colonial Liberation Front Soldier" - xenovictim = TRUE - -// UPP -/datum/equipment_preset/corpse/upp - name = "Corpse - UPP Colonial Defense Rifleman" - assignment = "Colonial Defense Rifleman" - idtype = /obj/item/card/id/dogtag - xenovictim = FALSE - faction = FACTION_UPP - -/datum/equipment_preset/corpse/upp/New() - . = ..() - access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) - -/datum/equipment_preset/corpse/upp/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP, WEAR_L_EAR) - //head - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/UPP, WEAR_HEAD) - //body - var/obj/item/clothing/under/marine/opfor/UPP/UPP = new() - new_human.equip_to_slot_or_del(UPP, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/UPP, WEAR_JACKET) - //limbs - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - -/datum/equipment_preset/corpse/upp/burst - name = "Corpse - UPP Colonial Defense Rifleman, Bursted" - xenovictim = TRUE - -// PMC - -/datum/equipment_preset/corpse/pmc - name = "Corpse - Weyland-Yutani PMC (Standard)" - flags = EQUIPMENT_PRESET_START_OF_ROUND - assignment = JOB_PMC_STANDARD - faction = FACTION_PMC - faction_group = FACTION_LIST_WY - rank = JOB_PMC_STANDARD - paygrade = "PMC-OP" - idtype = /obj/item/card/id/pmc - skills = /datum/skills/civilian/survivor/pmc - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - access = list( - ACCESS_CIVILIAN_PUBLIC, - ACCESS_CIVILIAN_LOGISTICS, - ACCESS_CIVILIAN_ENGINEERING, - ACCESS_CIVILIAN_RESEARCH, - ACCESS_CIVILIAN_BRIG, - ACCESS_CIVILIAN_MEDBAY, - ACCESS_CIVILIAN_COMMAND, - ACCESS_WY_GENERAL, - ACCESS_WY_COLONIAL, - ACCESS_WY_SECURITY, - ACCESS_WY_PMC, - ) - -/datum/equipment_preset/corpse/pmc/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc/hvh, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/pmc, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/pmc, WEAR_JACKET) - 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/head/helmet/marine/veteran/pmc, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/veteran/pmc/knife, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_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/belt/gun/m4a3/mod88, WEAR_WAIST) - 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/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) - add_random_survivor_equipment(new_human) - -/datum/equipment_preset/corpse/pmc/burst - name = "Corpse - Burst Weyland-Yutani PMC (Standard)" - xenovictim = TRUE - -// Freelancer - -/datum/equipment_preset/corpse/freelancer - name = "Corpse - Freelancer Mercenary" - assignment = "Freelancer Mercenary" - idtype = /obj/item/card/id/silver - xenovictim = FALSE - -/datum/equipment_preset/corpse/freelancer/New() - . = ..() - access = get_access(ACCESS_LIST_EMERGENCY_RESPONSE) + get_access(ACCESS_LIST_COLONIAL_ALL) - -/datum/equipment_preset/corpse/freelancer/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/freelancer, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/faction/freelancer, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/upp, WEAR_FEET) - 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/device/radio/headset/distress/dutch, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/five_slot, WEAR_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/pouch/tools/full(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/ert(new_human), WEAR_L_STORE) - spawn_merc_helmet(new_human) - -/datum/equipment_preset/corpse/freelancer/burst - name = "Corpse - Burst Freelancer Mercenary" - xenovictim = TRUE - -// Pizza Planet - -/datum/equipment_preset/corpse/pizza - name = "Corpse - Pizza Deliverer" - assignment = "Pizza Deliverer" - idtype = /obj/item/card/id/silver - faction = FACTION_PIZZA - xenovictim = FALSE - -/datum/equipment_preset/corpse/pizza/New() - . = ..() - access = get_access(ACCESS_LIST_DELIVERY) - -/datum/equipment_preset/corpse/pizza/load_gear(mob/living/carbon/human/new_human) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/pizza, 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/clothing/head/soft/red, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/red, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/pizzabox/margherita, WEAR_L_HAND) - new_human.equip_to_slot_or_del(new /obj/item/device/radio, WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/holdout, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/flashlight, WEAR_WAIST) - 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/pizzabox/vegetable, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/pizzabox/mushroom, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/pizzabox/meat, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/dr_gibb, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/food/drinks/cans/thirteenloko, WEAR_IN_BACK) - -/datum/equipment_preset/corpse/pizza/burst - name = "Corpse - Burst Pizza Deliverer" - xenovictim = TRUE - diff --git a/colonialmarines.dme b/colonialmarines.dme index 4d1b2c74c2..1b2ed15569 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -899,8 +899,6 @@ #include "code\game\machinery\vending\vendor_types\requisitions.dm" #include "code\game\machinery\vending\vendor_types\supplies.dm" #include "code\game\machinery\vending\vendor_types\wo_vendors.dm" -#include "code\game\machinery\vending\vendor_types\antag\antag_clothing.dm" -#include "code\game\machinery\vending\vendor_types\antag\antag_gear.dm" #include "code\game\machinery\vending\vendor_types\antag\antag_guns_snowflake.dm" #include "code\game\machinery\vending\vendor_types\antag\antag_guns_sorted.dm" #include "code\game\machinery\vending\vendor_types\crew\medical.dm" @@ -1478,7 +1476,6 @@ #include "code\modules\clothing\head\jobs.dm" #include "code\modules\clothing\head\misc.dm" #include "code\modules\clothing\head\misc_special.dm" -#include "code\modules\clothing\head\soft_caps.dm" #include "code\modules\clothing\masks\breath.dm" #include "code\modules\clothing\masks\gasmask.dm" #include "code\modules\clothing\masks\miscellaneous.dm"