From 3eb20868776d8678798f10dec3c50095dffd24e3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 17 Sep 2019 13:17:10 -0400 Subject: [PATCH] Requested changes --- code/game/machinery/vending.dm | 2 +- code/modules/clothing/gloves/color.dm | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index ba0139b135b..663230b11ff 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -1032,7 +1032,7 @@ /obj/item/weapon/tool/wrench = 5,/obj/item/device/analyzer = 5,/obj/item/device/t_scanner = 5,/obj/item/weapon/tool/screwdriver = 5, /obj/item/device/flashlight/glowstick = 3, /obj/item/device/flashlight/glowstick/red = 3, /obj/item/device/flashlight/glowstick/blue = 3, /obj/item/device/flashlight/glowstick/orange =3, /obj/item/device/flashlight/glowstick/yellow = 3) - contraband = list(/obj/item/weapon/weldingtool/hugetank = 2) //VORE: Removes budget insulated gloves. + contraband = list(/obj/item/weapon/weldingtool/hugetank = 2,/obj/item/clothing/gloves/fyellow = 2,) premium = list(/obj/item/clothing/gloves/yellow = 1) req_log_access = access_ce has_logs = 1 diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 81ca244fa8d..a030bc038c5 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -5,19 +5,19 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 -/obj/item/clothing/gloves/fyellow //VORE:These used to be budget insuls. Not changing the path due to upstream conflicts. - name = "yelllow gloves" - desc = "A pair of gloves, they don't look special in any way." +/obj/item/clothing/gloves/fyellow //Cheap Chinese Crap + desc = "These gloves are cheap copies of proper insulated gloves. No way this can end badly." + name = "budget insulated gloves" icon_state = "yellow" siemens_coefficient = 1 //Set to a default of 1, gets overridden in initialize() - //permeability_coefficient = 0.05 //VORE: These are yellow gloves now. -/*Vorestation edit: Budget gloves no longer protect you at all. + permeability_coefficient = 0.05 + /obj/item/clothing/gloves/fyellow/Initialize() . = ..() //Picks a value between 0 and 1.25, in 5% increments // VOREStation edit - var/shock_pick = rand(0,25) // VOREStation Edit + var/shock_pick = rand(0,15) // VOREStation Edit siemens_coefficient = shock_pick * 0.05 -*/ + /obj/item/clothing/gloves/black desc = "These work gloves are thick and fire-resistant." name = "black gloves"