From 75646ec3b8516c528b4ccb3c54cb5c0b198c0d25 Mon Sep 17 00:00:00 2001 From: NervanCatos Date: Sat, 2 Mar 2024 11:58:16 -0600 Subject: [PATCH 1/4] patches --- code/game/machinery/vending/cm_vending.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index 4f825030d627..190e88739f63 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -1275,13 +1275,19 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( if(vend_flags & VEND_UNIFORM_RANKS) if(insignas_override) var/obj/item/clothing/under/underclothes = new_item + //Gives ranks to the ranked if(istype(underclothes) && user.wear_id && user.wear_id.paygrade) var/rankpath = get_rank_pins(user.wear_id.paygrade) + //var/falconpatch = /obj/item/clothing/accessory/patch/falcon + //underclothes.attach_accessory(user,falconpatch) if(rankpath) var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath() + var/obj/item/clothing/accessory/patch/uscmpatch = new(get_turf(src)) + var/obj/item/clothing/accessory/patch/falcon/falconpatch = new(get_turf(src)) underclothes.attach_accessory(user, rank_insignia) - + underclothes.attach_accessory(user, uscmpatch) + underclothes.attach_accessory(user, falconpatch) if(vend_flags & VEND_UNIFORM_AUTOEQUIP) // autoequip if(istype(new_item, /obj/item) && new_item.flags_equip_slot != NO_FLAGS) //auto-equipping feature here From e816545ee7ab13d219482fb5161fce750cadf9fc Mon Sep 17 00:00:00 2001 From: NervanCatos Date: Sat, 2 Mar 2024 12:05:01 -0600 Subject: [PATCH 2/4] useless comments --- code/game/machinery/vending/cm_vending.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index 190e88739f63..a09f87df8a53 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -1279,8 +1279,6 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( //Gives ranks to the ranked if(istype(underclothes) && user.wear_id && user.wear_id.paygrade) var/rankpath = get_rank_pins(user.wear_id.paygrade) - //var/falconpatch = /obj/item/clothing/accessory/patch/falcon - //underclothes.attach_accessory(user,falconpatch) if(rankpath) var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath() var/obj/item/clothing/accessory/patch/uscmpatch = new(get_turf(src)) From 85e69d7cc60ed8c0bb60d3ae618a0895b9ef1b23 Mon Sep 17 00:00:00 2001 From: NervanCatos <32654903+MobiusWon@users.noreply.github.com> Date: Wed, 13 Mar 2024 21:18:22 -0500 Subject: [PATCH 3/4] no falcon patch --- code/game/machinery/vending/cm_vending.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index a09f87df8a53..5e7674c417ad 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -1282,10 +1282,9 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( if(rankpath) var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath() var/obj/item/clothing/accessory/patch/uscmpatch = new(get_turf(src)) - var/obj/item/clothing/accessory/patch/falcon/falconpatch = new(get_turf(src)) underclothes.attach_accessory(user, rank_insignia) underclothes.attach_accessory(user, uscmpatch) - underclothes.attach_accessory(user, falconpatch) + if(vend_flags & VEND_UNIFORM_AUTOEQUIP) // autoequip if(istype(new_item, /obj/item) && new_item.flags_equip_slot != NO_FLAGS) //auto-equipping feature here From 6e03e09ae213c88d62b137c7709648fe7d7e18bc Mon Sep 17 00:00:00 2001 From: Drathek <76988376+Drulikar@users.noreply.github.com> Date: Mon, 25 Mar 2024 16:03:59 -0700 Subject: [PATCH 4/4] Update code/game/machinery/vending/cm_vending.dm --- code/game/machinery/vending/cm_vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm index 5e7674c417ad..06ec8ddc7520 100644 --- a/code/game/machinery/vending/cm_vending.dm +++ b/code/game/machinery/vending/cm_vending.dm @@ -1281,7 +1281,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_corresponding_types_list, list( var/rankpath = get_rank_pins(user.wear_id.paygrade) if(rankpath) var/obj/item/clothing/accessory/ranks/rank_insignia = new rankpath() - var/obj/item/clothing/accessory/patch/uscmpatch = new(get_turf(src)) + var/obj/item/clothing/accessory/patch/uscmpatch = new() underclothes.attach_accessory(user, rank_insignia) underclothes.attach_accessory(user, uscmpatch)