From a38ab7c7c234a3371646a973d63c7ed4e2f5889a Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 25 Aug 2016 19:23:43 -0300 Subject: [PATCH] Small tweaks to heavy asset protection and mercenaries (#788) Admin deathsquad should have better loadout, fixing e-sword missing due to no equipment, stupid random names and apparence. Also, tajaran and unathi operatives start with sandals instead of barefoot. --- code/game/antagonist/outsider/deathsquad.dm | 9 +++++---- code/game/antagonist/outsider/mercenary.dm | 3 +++ html/changelogs/alberyk-PR-788.yml | 6 ++++++ 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/alberyk-PR-788.yml diff --git a/code/game/antagonist/outsider/deathsquad.dm b/code/game/antagonist/outsider/deathsquad.dm index e716cc72e95..aa33a96bda5 100644 --- a/code/game/antagonist/outsider/deathsquad.dm +++ b/code/game/antagonist/outsider/deathsquad.dm @@ -7,7 +7,7 @@ var/datum/antagonist/deathsquad/deathsquad role_text_plural = "Death Commandos" welcome_text = "You work in the service of Central Command Asset Protection, answering directly to the Board of Directors." landmark_id = "Commando" - flags = ANTAG_OVERRIDE_JOB | ANTAG_OVERRIDE_MOB | ANTAG_HAS_NUKE | ANTAG_HAS_LEADER | ANTAG_RANDOM_EXCEPTED + flags = ANTAG_OVERRIDE_JOB | ANTAG_CLEAR_EQUIPMENT | ANTAG_OVERRIDE_MOB | ANTAG_HAS_NUKE | ANTAG_HAS_LEADER | ANTAG_RANDOM_EXCEPTED | ANTAG_CHOOSE_NAME | ANTAG_SET_APPEARANCE default_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage) antaghud_indicator = "huddeathsquad" @@ -34,7 +34,7 @@ var/datum/antagonist/deathsquad/deathsquad if (player.mind == leader) player.equip_to_slot_or_del(new /obj/item/clothing/under/rank/centcom_officer(player), slot_w_uniform) else - player.equip_to_slot_or_del(new /obj/item/clothing/under/color/green(player), slot_w_uniform) + player.equip_to_slot_or_del(new /obj/item/clothing/under/ert(player), slot_w_uniform) player.equip_to_slot_or_del(new /obj/item/clothing/shoes/swat(player), slot_shoes) player.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(player), slot_gloves) @@ -45,10 +45,10 @@ var/datum/antagonist/deathsquad/deathsquad player.equip_to_slot_or_del(new /obj/item/weapon/disk/nuclear(player), slot_r_store) else player.equip_to_slot_or_del(new /obj/item/weapon/plastique(player), slot_l_store) + player.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(player), slot_r_store) player.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/revolver/mateba(player), slot_belt) player.equip_to_slot_or_del(new /obj/item/weapon/gun/energy/pulse_rifle(player), slot_r_hand) player.equip_to_slot_or_del(new /obj/item/weapon/rig/ert/assetprotection(player), slot_back) - player.equip_to_slot_or_del(new /obj/item/weapon/melee/energy/sword(player), slot_s_store) player.implant_loyalty(player) var/obj/item/weapon/card/id/id = create_id("Asset Protection", player) @@ -57,6 +57,7 @@ var/datum/antagonist/deathsquad/deathsquad id.icon_state = "centcom" create_radio(DTH_FREQ, player) +/* //disabling this until the names are fixed to don't be dumb, NanoTrasen has no military /datum/antagonist/deathsquad/update_antag_mob(var/datum/mind/player) ..() @@ -83,7 +84,7 @@ var/datum/antagonist/deathsquad/deathsquad H.dna.ready_dna(H) return - +*/ /datum/antagonist/deathsquad/create_antagonist() if(..() && !deployed) deployed = 1 diff --git a/code/game/antagonist/outsider/mercenary.dm b/code/game/antagonist/outsider/mercenary.dm index 4c902489c9d..0f2f53a497c 100644 --- a/code/game/antagonist/outsider/mercenary.dm +++ b/code/game/antagonist/outsider/mercenary.dm @@ -37,6 +37,9 @@ var/datum/antagonist/mercenary/mercs player.equip_to_slot_or_del(new /obj/item/clothing/under/syndicate(player), slot_w_uniform) player.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(player), slot_shoes) + if(!player.shoes) //If equipping shoes failed, fall back to equipping sandals + var/fallback_type = pick(/obj/item/clothing/shoes/sandal) + player.equip_to_slot_or_del(new fallback_type(player), slot_shoes) player.equip_to_slot_or_del(new /obj/item/clothing/gloves/swat(player), slot_gloves) player.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/military(player), slot_belt) if(player.backbag == 2) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(player), slot_back) diff --git a/html/changelogs/alberyk-PR-788.yml b/html/changelogs/alberyk-PR-788.yml new file mode 100644 index 00000000000..4e3fbe0123f --- /dev/null +++ b/html/changelogs/alberyk-PR-788.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "Unathi and Tajaran mercenaries should not spawn barefoot anymore."