From d0313e5574566fbce9af5f3cb334efd633d22073 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Wed, 15 Jun 2022 13:35:46 +0200 Subject: [PATCH] [MIRROR] fixes outfit sanity unit test initial [MDB IGNORE] (#14327) * fixes outfit sanity unit test initial (#67731) * fixes outfit sanity unit test initial * wahoo * fixes outfit sanity unit test initial * fixes outfit sanity unit test initial Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> --- code/modules/antagonists/gang/outfits.dm | 3 ++ code/modules/clothing/outfits/ert.dm | 10 ++++--- code/modules/clothing/outfits/standard.dm | 3 +- code/modules/clothing/outfits/vv_outfit.dm | 7 +++-- .../ruins/spaceruin_code/hilbertshotel.dm | 1 + .../mob_spawn/ghost_roles/unused_roles.dm | 29 ++++++++----------- code/modules/unit_tests/outfit_sanity.dm | 2 +- 7 files changed, 29 insertions(+), 26 deletions(-) diff --git a/code/modules/antagonists/gang/outfits.dm b/code/modules/antagonists/gang/outfits.dm index 82babe31609..d0e13af898d 100644 --- a/code/modules/antagonists/gang/outfits.dm +++ b/code/modules/antagonists/gang/outfits.dm @@ -1,3 +1,6 @@ +/datum/outfit/families_police + name = "Families: Base Cop" + /datum/outfit/families_police/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(visualsOnly) return diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index b73bcb0e8ab..2ecd99c0142 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -1,9 +1,11 @@ -/datum/outfit/centcom/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/centcom + name = "CentCom Base" + +/datum/outfit/centcom/post_equip(mob/living/carbon/human/centcom_member, visualsOnly = FALSE) if(visualsOnly) return - - var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)//hmm lets have centcom officials become revs - L.implant(H, null, 1) + var/obj/item/implant/mindshield/mindshield = new /obj/item/implant/mindshield(centcom_member)//hmm lets have centcom officials become revs + mindshield.implant(centcom_member, null, silent = TRUE) /datum/outfit/centcom/ert name = "ERT Common" diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index ebe74b907a6..05dc9b9df61 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -64,7 +64,8 @@ head = /obj/item/clothing/head/fedora/det_hat l_hand = /obj/item/gun/ballistic l_hand = null - r_pocket = /obj/item/ammo_box/c10mm + //r_pocket = /obj/item/ammo_box/c10mm + r_hand = /obj/item/ammo_box/c10mm // SKYRAT EDIT CHANGE /datum/outfit/tournament/janitor name = "tournament janitor" diff --git a/code/modules/clothing/outfits/vv_outfit.dm b/code/modules/clothing/outfits/vv_outfit.dm index 7c4fcc96dbd..3718e6bdef5 100644 --- a/code/modules/clothing/outfits/vv_outfit.dm +++ b/code/modules/clothing/outfits/vv_outfit.dm @@ -1,13 +1,14 @@ // This outfit preserves varedits made on the items // Created from admin helpers. /datum/outfit/varedit + name = "Var Edited Outfit" var/list/vv_values var/list/stored_access var/update_id_name = FALSE //If the name of the human is same as the name on the id they're wearing we'll update provided id when equipping -/datum/outfit/varedit/pre_equip(mob/living/carbon/human/H, visualsOnly) - H.delete_equipment() //Applying VV to wrong objects is not reccomended. - . = ..() +/datum/outfit/varedit/pre_equip(mob/living/carbon/human/equipping_mob, visualsOnly) + equipping_mob.delete_equipment() //Applying VV to wrong objects is not reccomended. + return ..() /datum/outfit/varedit/proc/set_equipement_by_slot(slot,item_path) switch(slot) diff --git a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm index 83cc822d15f..5d9b36ff0c0 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/hilbertshotel.dm @@ -521,6 +521,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999)) puzzle_id = "hilbert_office" /datum/outfit/doctorhilbert + name = "Doctor Hilbert" id = /obj/item/card/id/advanced/silver uniform = /obj/item/clothing/under/rank/rnd/research_director/doctor_hilbert shoes = /obj/item/clothing/shoes/sneakers/brown diff --git a/code/modules/mob_spawn/ghost_roles/unused_roles.dm b/code/modules/mob_spawn/ghost_roles/unused_roles.dm index 2b4fac880a7..68183e78ef8 100644 --- a/code/modules/mob_spawn/ghost_roles/unused_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/unused_roles.dm @@ -283,9 +283,6 @@ outfit = /datum/outfit/syndicatespace/syndicrew spawner_job_path = /datum/job/syndicate_cybersun -/datum/outfit/syndicatespace/syndicrew/post_equip(mob/living/carbon/human/H) - H.faction |= ROLE_SYNDICATE - /obj/effect/mob_spawn/ghost_role/human/syndicatespace/special(mob/living/new_spawn) . = ..() new_spawn.grant_language(/datum/language/codespeak, TRUE, TRUE, LANGUAGE_MIND) @@ -303,39 +300,37 @@ outfit = /datum/outfit/syndicatespace/syndicaptain spawner_job_path = /datum/job/syndicate_cybersun_captain -/datum/outfit/syndicatespace/syndicaptain/post_equip(mob/living/carbon/human/H) - H.faction |= ROLE_SYNDICATE - /obj/effect/mob_spawn/ghost_role/human/syndicatespace/captain/Destroy() new /obj/structure/fluff/empty_sleeper/syndicate/captain(get_turf(src)) return ..() -/datum/outfit/syndicatespace/syndicrew - name = "Syndicate Ship Crew Member" +/datum/outfit/syndicatespace + name = "Syndicate Ship Base" uniform = /obj/item/clothing/under/syndicate/combat - glasses = /obj/item/clothing/glasses/night - mask = /obj/item/clothing/mask/gas/syndicate ears = /obj/item/radio/headset/syndicate/alt shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack - l_pocket = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/knife/combat/survival belt = /obj/item/storage/belt/military/assault id = /obj/item/card/id/advanced/black/syndicate_command/crew_id implants = list(/obj/item/implant/weapons_auth) +/datum/outfit/syndicatespace/post_equip(mob/living/carbon/human/syndie_scum) + syndie_scum.faction |= ROLE_SYNDICATE + +/datum/outfit/syndicatespace/syndicrew + name = "Syndicate Ship Crew Member" + glasses = /obj/item/clothing/glasses/night + mask = /obj/item/clothing/mask/gas/syndicate + l_pocket = /obj/item/gun/ballistic/automatic/pistol + r_pocket = /obj/item/knife/combat/survival + /datum/outfit/syndicatespace/syndicaptain name = "Syndicate Ship Captain" uniform = /obj/item/clothing/under/syndicate/combat suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate head = /obj/item/clothing/head/hos/beret/syndicate ears = /obj/item/radio/headset/syndicate/alt/leader - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - back = /obj/item/storage/backpack r_pocket = /obj/item/knife/combat/survival - belt = /obj/item/storage/belt/military/assault id = /obj/item/card/id/advanced/black/syndicate_command/captain_id - implants = list(/obj/item/implant/weapons_auth) backpack_contents = list(/obj/item/documents/syndicate/red, /obj/item/paper/fluff/ruins/forgottenship/password, /obj/item/gun/ballistic/automatic/pistol/aps) diff --git a/code/modules/unit_tests/outfit_sanity.dm b/code/modules/unit_tests/outfit_sanity.dm index b7a38ebc00b..a105bb423ae 100644 --- a/code/modules/unit_tests/outfit_sanity.dm +++ b/code/modules/unit_tests/outfit_sanity.dm @@ -20,7 +20,7 @@ r_hand = /obj/item/stack/spacecash/c1000 /datum/unit_test/outfit_sanity/Run() - var/datum/outfit/prototype_outfit + var/datum/outfit/prototype_outfit = /datum/outfit var/prototype_name = initial(prototype_outfit.name) var/mob/living/carbon/human/H = allocate(/mob/living/carbon/human)