From 939e289c3ef05fdc8b4cba0f10bf2d1288ce376c Mon Sep 17 00:00:00 2001 From: Hatterhat <31829017+Hatterhat@users.noreply.github.com> Date: Wed, 23 May 2018 14:06:11 -0500 Subject: [PATCH 1/2] KNEE :clap: JERK :clap: RE :clap: VERT :clap: "fixes flash icons" (#6861) * Revert "Automatic changelog generation for PR #6860 [ci skip]" This reverts commit 1b5238e58e72822c333f9e83b1c64bb3cdd40f0f. * Revert "fixes flash icons (#6860)" This reverts commit 88382c10587dc76ef2e2222a8a8782e028fcc993. --- code/modules/assembly/flash.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index c60519b45e..6093b4a97c 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -1,6 +1,7 @@ /obj/item/assembly/flash name = "flash" desc = "A powerful and versatile flashbulb device, with applications ranging from disorienting attackers to acting as visual receptors in robot production." + icon = 'icons/obj/device.dmi' icon_state = "flash" item_state = "flashtool" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' From 624351076e2fe274017b345b5b97462826c08d03 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 5 Jul 2018 09:49:07 -0400 Subject: [PATCH 2/2] Update autodrobe.dm Adds in more clothing for gimmicks or to look fancy! None of those outfits have any armor or usefulness other then to look good or cover your face if its a mask similar to the chicken hat Why: These outfits look nice and have no real in-game affect for Power-gamers --- code/modules/vending/autodrobe.dm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index c0cfe661d7..e73af5b8c7 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -119,7 +119,15 @@ /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/shield/riot/roman/fake = 1, - /obj/item/skub = 1) + /obj/item/skub = 1, + /obj/item/clothing/under/lobster = 1, // CIT CHANGES + /obj/item/clothing/head/lobsterhat = 1, + /obj/item/clothing/head/drfreezehat = 1, + /obj/item/clothing/suit/dracula = 1, + /obj/item/clothing/suit/drfreeze_coat = 1, + /obj/item/clothing/suit/gothcoat = 2, + /obj/item/clothing/under/draculass = 1, + /obj/item/clothing/under/drfreeze = 1) //End of Cit Changes refill_canister = /obj/item/vending_refill/autodrobe /obj/item/vending_refill/autodrobe