From 6a61826abae1384113fb7340e465909f8bc9e13b Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 28 May 2020 10:26:08 -0400 Subject: [PATCH 1/2] Fix solgov icons --- code/modules/clothing/suits/solgov.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/suits/solgov.dm b/code/modules/clothing/suits/solgov.dm index 8f89cbdbf3..a4d6e84422 100644 --- a/code/modules/clothing/suits/solgov.dm +++ b/code/modules/clothing/suits/solgov.dm @@ -2,7 +2,7 @@ /obj/item/clothing/suit/storage/solgov name = "master solgov jacket" icon = 'icons/obj/clothing/suits_solgov.dmi' - item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi') + icon_override = 'icons/mob/suit_solgov.dmi' //Service @@ -262,7 +262,7 @@ icon_state = "blackdress" item_state = "blackdress" icon = 'icons/obj/clothing/suits_solgov.dmi' - item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi') + icon_override = 'icons/mob/suit_solgov.dmi' body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 @@ -293,7 +293,7 @@ name = "\improper SifGuard winter coat" icon_state = "coatec" icon = 'icons/obj/clothing/suits_solgov.dmi' - item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi') + icon_override = 'icons/mob/suit_solgov.dmi' armor = list(melee = 25, bullet = 10, laser = 5, energy = 10, bomb = 20, bio = 0, rad = 10) valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA,ACCESSORY_SLOT_RANK) @@ -344,7 +344,7 @@ icon_state = "terranservice" item_state = "terranservice" icon = 'icons/obj/clothing/suits_solgov.dmi' - item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi') + icon_override = 'icons/mob/suit_solgov.dmi' /obj/item/clothing/suit/storage/terran/service/navy/command name = "indie command coat" @@ -360,7 +360,7 @@ icon_state = "terrandress" item_state = "terrandress" icon = 'icons/obj/clothing/suits_solgov.dmi' - item_icons = list(slot_w_uniform_str = 'icons/mob/suit_solgov.dmi') + icon_override = 'icons/mob/suit_solgov.dmi' body_parts_covered = UPPER_TORSO|ARMS armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 From cbe0ce9c849b9c42118bd5e539fc35b7b85bed29 Mon Sep 17 00:00:00 2001 From: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat, 30 May 2020 01:54:38 -0400 Subject: [PATCH 2/2] Fixes accessory slots --- code/modules/clothing/suits/solgov.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/clothing/suits/solgov.dm b/code/modules/clothing/suits/solgov.dm index a4d6e84422..3fa969b369 100644 --- a/code/modules/clothing/suits/solgov.dm +++ b/code/modules/clothing/suits/solgov.dm @@ -16,8 +16,8 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 allowed = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/flashlight,/obj/item/weapon/pen,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/flame/lighter,/obj/item/device/taperecorder,/obj/item/device/analyzer,/obj/item/device/radio,/obj/item/taperoll) - valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND,ACCESSORY_SLOT_MEDAL,ACCESSORY_SLOT_INSIGNIA,ACCESSORY_SLOT_RANK,ACCESSORY_SLOT_DEPT) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) + valid_accessory_slots = (ACCESSORY_SLOT_ARMBAND|ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_RANK|ACCESSORY_SLOT_DEPT) + restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND) /obj/item/clothing/suit/storage/solgov/service/sifguard name = "\improper SifGuard jacket" @@ -186,8 +186,8 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 allowed = list(/obj/item/weapon/tank/emergency/oxygen,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen) - valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL,ACCESSORY_SLOT_RANK) - restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND) + valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK) + restricted_accessory_slots = (ACCESSORY_SLOT_ARMBAND) /obj/item/clothing/suit/storage/solgov/dress/sifguard name = "\improper SifGuard dress jacket" @@ -267,7 +267,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 allowed = list(/obj/item/weapon/tank/emergency,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen) - valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL,ACCESSORY_SLOT_RANK) + valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK) /obj/item/clothing/suit/dress/solgov/fleet/sailor name = "fleet dress overwear" @@ -295,19 +295,19 @@ icon = 'icons/obj/clothing/suits_solgov.dmi' icon_override = 'icons/mob/suit_solgov.dmi' armor = list(melee = 25, bullet = 10, laser = 5, energy = 10, bomb = 20, bio = 0, rad = 10) - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA,ACCESSORY_SLOT_RANK) + valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_RANK) /obj/item/clothing/suit/storage/hooded/wintercoat/solgov/army name = "marine winter coat" icon_state = "coatar" armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0) - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA,ACCESSORY_SLOT_RANK) + valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA|ACCESSORY_SLOT_RANK) /obj/item/clothing/suit/storage/hooded/wintercoat/solgov/fleet name = "fleet winter coat" icon_state = "coatfl" armor = list(melee = 20, bullet = 10, laser = 10, energy = 20, bomb = 20, bio = 0, rad = 10) - valid_accessory_slots = list(ACCESSORY_SLOT_INSIGNIA) + valid_accessory_slots = (ACCESSORY_SLOT_INSIGNIA) /obj/item/clothing/suit/storage/toggle/dress name = "clasped dress jacket" @@ -365,7 +365,7 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) siemens_coefficient = 0.9 allowed = list(/obj/item/weapon/tank/emergency,/obj/item/device/flashlight,/obj/item/clothing/head/soft,/obj/item/clothing/head/beret,/obj/item/device/radio,/obj/item/weapon/pen) - valid_accessory_slots = list(ACCESSORY_SLOT_MEDAL,ACCESSORY_SLOT_RANK) + valid_accessory_slots = (ACCESSORY_SLOT_MEDAL|ACCESSORY_SLOT_RANK) /obj/item/clothing/suit/dress/terran/navy name = "ICCGN dress cloak" @@ -383,4 +383,4 @@ name = "ICCGN command dress cloak" desc = "A black ICCG Navy dress cloak with royal detailing. Smells like ceremony." icon_state = "terrandress_comm" - item_state = "terrandress_comm" \ No newline at end of file + item_state = "terrandress_comm"