From ea821dcaefd77c84caa674c69e9657ffcf3212f0 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Wed, 4 May 2016 19:05:39 +0100 Subject: [PATCH] Maint table tweaks Merged coloured gloves into one, added airlock painter, added secure briefcases in preperation for the great mystery box ride. --- .../game/objects/effects/spawners/lootdrop.dm | 15 ++++------- code/modules/clothing/gloves/color.dm | 26 +++++++++++++++++++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 35f19edece8..300118c94aa 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -76,7 +76,8 @@ /obj/item/device/flashlight/pen = 1, /obj/item/device/multitool = 2, /obj/item/device/radio/off = 2, - /obj/item/device/t_scanner = 6, + /obj/item/device/t_scanner = 5, + /obj/item/weapon/airlock_painter = 1, /obj/item/stack/cable_coil = 4, /obj/item/stack/cable_coil{amount = 5} = 6, /obj/item/stack/medical/bruise_pack = 1, @@ -130,16 +131,10 @@ /obj/item/device/assembly/signaler = 2, /obj/item/device/assembly/mousetrap = 2, /obj/item/weapon/reagent_containers/syringe = 2, - /obj/item/clothing/gloves/color/orange = 1, - /obj/item/clothing/gloves/color/red = 1, - /obj/item/clothing/gloves/color/blue = 1, - /obj/item/clothing/gloves/color/purple = 1, - /obj/item/clothing/gloves/color/green = 1, - /obj/item/clothing/gloves/color/grey = 1, - /obj/item/clothing/gloves/color/light_brown = 1, - /obj/item/clothing/gloves/color/brown = 1, + /obj/item/clothing/gloves/color/random = 8, /obj/item/clothing/shoes/laceup = 1, - "" = 4 + /obj/item/weapon/storage/secure/briefcase = 3, + "" = 1 ) /obj/effect/spawner/lootdrop/crate_spawner diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index cf96d56348f..7ffd3afefd5 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -173,3 +173,29 @@ /obj/item/clothing/gloves/color/white/redcoat item_color = "redcoat" //Exists for washing machines. Is not different from white gloves in any way. + +/obj/item/clothing/gloves/color/random + name = "random gloves" + desc = "These gloves are supposed to be a random color..." + icon_state = "white" + item_state = "wgloves" + item_color = "mime" + +/obj/item/clothing/gloves/color/random/New() + var/list/gloves = list( + /obj/item/clothing/gloves/color/orange = 1, + /obj/item/clothing/gloves/color/red = 1, + /obj/item/clothing/gloves/color/blue = 1, + /obj/item/clothing/gloves/color/purple = 1, + /obj/item/clothing/gloves/color/green = 1, + /obj/item/clothing/gloves/color/grey = 1, + /obj/item/clothing/gloves/color/light_brown = 1, + /obj/item/clothing/gloves/color/brown = 1) + + var/obj/item/clothing/gloves/color/selected = pick(gloves) + + name = initial(selected.name) + desc = initial(selected.desc) + icon_state = initial(selected.icon_state) + item_state = initial(selected.item_state) + item_color = initial(selected.item_color)