diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index c4d87a43423..cf80ddd690e 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -69,7 +69,7 @@ /datum/outfit/job/detective/idris name = "Detective - Idris" - uniform = /obj/item/clothing/under/rank/security/idris/alt + uniform = /obj/item/clothing/under/rank/security/idris id = /obj/item/weapon/card/id/idris/sec /datum/outfit/job/bartender/idris diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm index 1111a814b3e..22bd4a583f8 100644 --- a/code/modules/cargo/random_stock/t1_common.dm +++ b/code/modules/cargo/random_stock/t1_common.dm @@ -237,7 +237,8 @@ STOCK_ITEM_COMMON(gloves, 3.3) /obj/item/clothing/gloves/swat/fluff/hawk_gloves, /obj/item/clothing/gloves/black/fluff/kathleen_glove, /obj/item/clothing/gloves/powerfist, - /obj/item/clothing/gloves/claws + /obj/item/clothing/gloves/claws, + /obj/item/clothing/gloves/ballistic ) exclusion += typesof(/obj/item/clothing/gloves/rig) exclusion += typesof(/obj/item/clothing/gloves/lightrig) diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index d0049fd39f0..9a6b218ec6f 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -111,10 +111,6 @@ icon_state = "idris_sec" worn_state = "idris_sec" -/obj/item/clothing/under/rank/security/idris/alt - icon_state = "idris_alt" - worn_state = "idris_alt" - /obj/item/clothing/under/rank/security/eridani name = "Eridani PMC uniform" desc = "A uniform worn by contracted Eridani security forces." diff --git a/html/changelogs/alberyk-fixesstuff.yml b/html/changelogs/alberyk-fixesstuff.yml new file mode 100644 index 00000000000..5a2a987cf6d --- /dev/null +++ b/html/changelogs/alberyk-fixesstuff.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed ballistic gauntlets spawning at cargo." diff --git a/icons/obj/custom_items/likho_labcoat.dmi b/icons/obj/custom_items/likho_labcoat.dmi index 2b09fbfa32f..8c40fab39d0 100644 Binary files a/icons/obj/custom_items/likho_labcoat.dmi and b/icons/obj/custom_items/likho_labcoat.dmi differ diff --git a/icons/obj/hydroponics_growing.dmi b/icons/obj/hydroponics_growing.dmi index 3715e8b8467..be91d37295d 100644 Binary files a/icons/obj/hydroponics_growing.dmi and b/icons/obj/hydroponics_growing.dmi differ diff --git a/icons/obj/hydroponics_products.dmi b/icons/obj/hydroponics_products.dmi index 58ad341448d..2bdcabb5a71 100644 Binary files a/icons/obj/hydroponics_products.dmi and b/icons/obj/hydroponics_products.dmi differ