From 9860838523d60e8967f6df50bcc076a8fad84b52 Mon Sep 17 00:00:00 2001 From: AmoryBlaine Date: Mon, 5 Aug 2024 01:06:50 -0400 Subject: [PATCH] WIP --- .../effects/landmarks/corpsespawner.dm | 37 ---- code/modules/gear_presets/uscm.dm | 5 +- code/modules/gear_presets/uscm_ship.dm | 164 +++++++----------- colonialmarines.dme | 1 + 4 files changed, 69 insertions(+), 138 deletions(-) diff --git a/code/game/objects/effects/landmarks/corpsespawner.dm b/code/game/objects/effects/landmarks/corpsespawner.dm index 1cd22ada7c..bfdd903e38 100644 --- a/code/game/objects/effects/landmarks/corpsespawner.dm +++ b/code/game/objects/effects/landmarks/corpsespawner.dm @@ -56,14 +56,6 @@ /////////////////Officers////////////////////// -/obj/effect/landmark/corpsespawner/bridgeofficer - name = "Staff Officer" - equip_path = /datum/equipment_preset/corpse/bridgeofficer - -/obj/effect/landmark/corpsespawner/bridgeofficer/johnson - name = "Mr. Johnson Telovin" - equip_path = /datum/equipment_preset/corpse/bridgeofficer/johnson - /obj/effect/landmark/corpsespawner/commander name = "Commanding Officer" equip_path = /datum/equipment_preset/corpse/commander @@ -72,37 +64,8 @@ name = "Weyland-Yutani Corporate Security Guard" equip_path = /datum/equipment_preset/corpse/wysec -/obj/effect/landmark/corpsespawner/wygoon - name = "Weyland-Yutani Corporate Security Goon" - equip_path = /datum/equipment_preset/corpse/pmc/goon - - ///CM specific jobs/// -/obj/effect/landmark/corpsespawner/colonist //default is a colonist - name = "Colonist" - equip_path = /datum/equipment_preset/corpse/colonist - -/obj/effect/landmark/corpsespawner/colonist/burst - name = "Burst Colonist" - equip_path = /datum/equipment_preset/corpse/colonist/burst - -/obj/effect/landmark/corpsespawner/colonist/kutjevo - name = "Colonist Kutjevo" - equip_path = /datum/equipment_preset/corpse/colonist/kutjevo - -/obj/effect/landmark/corpsespawner/colonist/kutjevo/burst - name = "Burst Colonist Kutjevo" - equip_path = /datum/equipment_preset/corpse/colonist/kutjevo/burst - -/obj/effect/landmark/corpsespawner/colonist/random - name = "Colonist Random" - equip_path = /datum/equipment_preset/corpse/colonist/random - -/obj/effect/landmark/corpsespawner/colonist/random/burst - name = "Burst Colonist Random" - equip_path = /datum/equipment_preset/corpse/colonist/random/burst - /obj/effect/landmark/corpsespawner/ua_riot name = "UA Officer" equip_path = /datum/equipment_preset/corpse/ua_riot diff --git a/code/modules/gear_presets/uscm.dm b/code/modules/gear_presets/uscm.dm index 9dbf36b24f..99ccbb9f39 100644 --- a/code/modules/gear_presets/uscm.dm +++ b/code/modules/gear_presets/uscm.dm @@ -365,7 +365,6 @@ paygrade = "ME7" //*****************************************************************************************************/ -// ERT members that spawn with full gear from DEFCON /datum/equipment_preset/uscm/private_equipped name = "USCM Squad Rifleman (Equipped)" @@ -751,7 +750,7 @@ /datum/equipment_preset/uscm/marsoc name = "USCM Raider" flags = EQUIPMENT_PRESET_EXTRA - assignment = "Marine Raider" + assignment = "USCM Marine Raider" rank = JOB_MARINE_RAIDER role_comm_title = "RAIDER" languages = list(LANGUAGE_ENGLISH, LANGUAGE_TSL) @@ -811,7 +810,7 @@ //Team Leader /datum/equipment_preset/uscm/marsoc/sl - name = "Marine Raider Team Leader (!DEATHSQUAD!)" + name = "USCM Marine Raider Leader" assignment = JOB_MARINE_RAIDER_SL rank = JOB_MARINE_RAIDER_SL role_comm_title = "TL." diff --git a/code/modules/gear_presets/uscm_ship.dm b/code/modules/gear_presets/uscm_ship.dm index 8ee7c628b1..a13bc4fd5e 100644 --- a/code/modules/gear_presets/uscm_ship.dm +++ b/code/modules/gear_presets/uscm_ship.dm @@ -22,7 +22,71 @@ dress_shoes = list(/obj/item/clothing/shoes/laceup) //*****************************************************************************************************/ +/datum/equipment_preset/uscm_ship/so + name = "USCM Platoon Commander (PltCo)" + flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE + + idtype = /obj/item/card/id/dogtag + assignment = JOB_SO + rank = JOB_SO + paygrade = "MO2" + role_comm_title = "PltCo" + minimum_age = 25 + skills = /datum/skills/SO + minimap_icon = list("cic" = MINIMAP_ICON_COLOR_SILVER) + minimap_background = MINIMAP_ICON_BACKGROUND_CIC + var/access_list = ACCESS_LIST_MARINE_MAIN + +/datum/equipment_preset/uscm_ship/so/New() + . = ..() + access = get_access(access_list) + +/datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/service(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/clothing/head/cmcap(new_human), WEAR_HEAD) + 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/general/medium(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(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/mod88(new_human), WEAR_IN_R_STORE) + +/datum/equipment_preset/uscm_ship/so/load_status(mob/living/carbon/human/new_human, client/mob_client) + . = ..() + + if(!new_human.client) + return + add_verb(new_human.client, /client/proc/commander_rename_platoon) + +/datum/equipment_preset/uscm_ship/so/lesser_rank + paygrade = "MO1" + +/datum/equipment_preset/uscm_ship/so/upp + name = "UPP Platoon Commander (PltCo)" + languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH) + paygrade = "UO2" + faction_group = list(FACTION_UPP) + faction = FACTION_UPP + access_list = ACCESS_LIST_UPP_PLATOON + +/datum/equipment_preset/uscm_ship/so/upp/load_gear(mob/living/carbon/human/new_human) + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP/officer(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/belt/gun/type47/np92(new_human), WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked(new_human), WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp(new_human), WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) + +/datum/equipment_preset/uscm_ship/so/upp/lesser_rank + paygrade = "UO1" + +//*****************************************************************************************************/ /datum/equipment_preset/uscm_ship/reporter name = "Combat Correspondent (CIV)" flags = EQUIPMENT_PRESET_START_OF_ROUND @@ -306,72 +370,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/uscm_ship/so - name = "USCM Platoon Commander (PltCo)" - flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE - - idtype = /obj/item/card/id/dogtag - assignment = JOB_SO - rank = JOB_SO - paygrade = "MO2" - role_comm_title = "PltCo" - minimum_age = 25 - skills = /datum/skills/SO - minimap_icon = list("cic" = MINIMAP_ICON_COLOR_SILVER) - minimap_background = MINIMAP_ICON_BACKGROUND_CIC - var/access_list = ACCESS_LIST_MARINE_MAIN - -/datum/equipment_preset/uscm_ship/so/New() - . = ..() - access = get_access(access_list) - -/datum/equipment_preset/uscm_ship/so/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/service(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/clothing/head/cmcap(new_human), WEAR_HEAD) - 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/general/medium(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(new_human), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/mod88/normalpoint(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/mod88(new_human), WEAR_IN_R_STORE) - -/datum/equipment_preset/uscm_ship/so/load_status(mob/living/carbon/human/new_human, client/mob_client) - . = ..() - - if(!new_human.client) - return - - add_verb(new_human.client, /client/proc/commander_rename_platoon) - -/datum/equipment_preset/uscm_ship/so/lesser_rank - paygrade = "MO1" - -/datum/equipment_preset/uscm_ship/so/upp - name = "UPP Platoon Commander (PltCo)" - languages = list(LANGUAGE_RUSSIAN, LANGUAGE_ENGLISH) - paygrade = "UO2" - faction_group = list(FACTION_UPP) - faction = FACTION_UPP - access_list = ACCESS_LIST_UPP_PLATOON - -/datum/equipment_preset/uscm_ship/so/upp/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/UPP/command(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/opfor/UPP/officer(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/belt/gun/type47/np92(new_human), WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/uppcap/peaked(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack/upp(new_human), WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/general/large(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range(new_human), WEAR_L_HAND) - -/datum/equipment_preset/uscm_ship/so/upp/lesser_rank - paygrade = "UO1" - -//*****************************************************************************************************/ - /datum/equipment_preset/uscm_ship/sea name = "USCM Senior Enlisted Advisor (SEA)" flags = EQUIPMENT_PRESET_START_OF_ROUND|EQUIPMENT_PRESET_MARINE @@ -411,8 +409,8 @@ //*****************************************************************************************************/ -/datum/equipment_preset/uscm_ship/po/full - name = "USCM Pilot Officer (PO)" +/datum/equipment_preset/uscm_ship/po + name = "USCM Flight Officer" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE /datum/equipment_preset/uscm_ship/po/full/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/mcom(new_human), WEAR_L_EAR) @@ -430,36 +428,6 @@ //*****************************************************************************************************/ -/datum/equipment_preset/uscm_ship/po/recon - name = "USCM Reconnaissance Pilot" - flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE - assignment = "FORECON Pilot" - -/datum/equipment_preset/uscm_ship/po/recon/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/sof(new_human), WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/operations(new_human), WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/vest/pilot(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/clothing/gloves/marine/brown(new_human), WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/medical/lifesaver/standard/full(new_human), WEAR_WAIST) - 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/firstaid/adv(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/reagent_container/blood/OMinus(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/surgical_line(new_human), WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/healthanalyzer(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/surgical_case/regular(new_human), WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol(new_human), WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/m1911/socom(new_human), WEAR_IN_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/pistol(new_human), WEAR_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/pistol/m1911(new_human), WEAR_IN_R_STORE) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/cmcap(new_human), WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health(new_human), WEAR_EYES) - -//*****************************************************************************************************/ - /datum/equipment_preset/uscm_ship/dcc/full name = "USCM Dropship Crew Chief (DCC)" flags = EQUIPMENT_PRESET_EXTRA|EQUIPMENT_PRESET_MARINE diff --git a/colonialmarines.dme b/colonialmarines.dme index 8ed06f78c2..4d1b2c74c2 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -1478,6 +1478,7 @@ #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"