From 07f1e40bda1a26e1a2ecd194ee0f673a8dc8d7a7 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 22 Sep 2019 17:42:48 -0300 Subject: [PATCH] Bug fixes: cargo robusting gloves, skrell plants and idris clothing (#7039) --- code/game/jobs/faction/idris.dm | 2 +- code/modules/cargo/random_stock/t1_common.dm | 3 ++- code/modules/clothing/under/jobs/security.dm | 4 ---- html/changelogs/alberyk-fixesstuff.yml | 6 ++++++ icons/obj/custom_items/likho_labcoat.dmi | Bin 1156 -> 1144 bytes icons/obj/hydroponics_growing.dmi | Bin 39813 -> 39810 bytes icons/obj/hydroponics_products.dmi | Bin 20685 -> 20682 bytes 7 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/alberyk-fixesstuff.yml 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 2b09fbfa32f3fac991a4483feed9a40a7f29ee1b..8c40fab39d042df3b7137908113c6102df0320cc 100644 GIT binary patch delta 45 zcmV+|0Mh@23HS(*a{+{rbZ{J^mf})`1`}fKz@tl9!PU~R2*gH6k?pQ;zL3;}op D*Oe4Q delta 56 zcmV-80LTCM2!sica{-W%bZ{tG3siAQYEe;QUTSG^d~qp4lL@i*;L)Y5;OgfB_B;Rr OxKE8={dViJ0eAzWN*O}{ diff --git a/icons/obj/hydroponics_growing.dmi b/icons/obj/hydroponics_growing.dmi index 3715e8b8467cb7adcc70ed515b950d1550d52a4c..be91d37295dec5e3cfbc3ff34495bf1a6f40f5fc 100644 GIT binary patch delta 909 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 delta 653 zcmV;80&@Mzp#jaI0gxnrX?j#xbVOxyV{&P5bZKvH004NLrPs}F+b|3V@N@DMLVMm2 z=VNUTxeO_W9NKrFZ6+2XO9m}F$lLEAImhuY?A8K5q83Gw?5p|x`RDv?PG9Hs%re^G z&C%?CZq}>2ZDVJSX186hI=0s?reDTLkS-BQ=XWRMk*j)0F`y5+ca-duTfAtgeFS=WK28 zdTRN49UOW61Q!?XEcywO(@QBiy_S;Gizzw1My^5wLu>?sfyr_l`-=#SmI-JpLFYv{M6Q*ID-4 zGQKP0`!asOd7kiaK%VrtXTmdCv&aM1c>^f$A|V!X{9c=X&N_?hAb4KV%Y^x|GQa_O zbtv?B4d+#&(BoB{R}0vu6{CcYg&NQ0GS!L$s!e%FRUA@&5WFm&D@t($UK-Dpr8wfP zIO4rH;scJzD-G_ah~u>4z+7yDcil0PyTLlGJ~&@iAbj8rgTp`GaUbwDop&DC&(`Cg zGF#91W4w2NOn6d;(8BirL7u~o=>iT_jOKX_;pd2i^fDg{@Sy~c7|vr0vd^(nq^nJt z2U8-pVN9lO0nywlAe&x2SaB@!z-)Sx5KRvfJXlRlgEzr?a&-{~+8)gXvnFvp1yeuJ nKmTEUHJ{%nbNV{3{{rVEU7XmzK_UPEAOJ~3K~#9NoB}RR&X+=}