From 871843fb6b6c019d433d45980864cf087fbc7159 Mon Sep 17 00:00:00 2001 From: chaoko99 Date: Mon, 16 Sep 2019 22:57:19 -0700 Subject: [PATCH 1/4] Removes any protection from budget insulated gloves --- code/modules/clothing/gloves/color.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index a456e85939a..3bbd1d657dd 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -11,13 +11,13 @@ icon_state = "yellow" siemens_coefficient = 1 //Set to a default of 1, gets overridden in initialize() permeability_coefficient = 0.05 - +/*Vorestation edit: Budget gloves no longer protect you at all. /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 siemens_coefficient = shock_pick * 0.05 - +*/ /obj/item/clothing/gloves/black desc = "These work gloves are thick and fire-resistant." name = "black gloves" From d3132056466e6e7de673e437c5abfc99491e89cb Mon Sep 17 00:00:00 2001 From: chaoko99 Date: Mon, 16 Sep 2019 22:57:49 -0700 Subject: [PATCH 2/4] removes any non-mapped uses of budget insuls. --- code/game/objects/structures/loot_piles.dm | 1 - code/game/objects/structures/trash_pile.dm | 1 - 2 files changed, 2 deletions(-) diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index f74770664bb..0b947297e25 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -158,7 +158,6 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/clothing/gloves/sterile/latex, /obj/item/clothing/gloves/white, /obj/item/clothing/gloves/rainbow, - /obj/item/clothing/gloves/fyellow, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson/prescription, diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index bc06bb0dbd9..d88d3fe71af 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -173,7 +173,6 @@ prob(3);/obj/item/weapon/storage/box/mousetraps, prob(3);/obj/item/weapon/storage/wallet, prob(2);/obj/item/clothing/glasses/meson/prescription, - prob(2);/obj/item/clothing/gloves/fyellow, prob(2);/obj/item/clothing/gloves/sterile/latex, prob(2);/obj/item/clothing/head/welding, prob(2);/obj/item/clothing/mask/gas/half, From 8c62c7401fc90883375a27b548b473b49fb781b5 Mon Sep 17 00:00:00 2001 From: chaoko99 Date: Mon, 16 Sep 2019 23:06:57 -0700 Subject: [PATCH 3/4] I like Heroman's idea: These are just regular yellow gloves now. --- code/game/machinery/vending.dm | 2 +- code/game/objects/structures/loot_piles.dm | 1 + code/game/objects/structures/trash_pile.dm | 1 + code/modules/clothing/gloves/color.dm | 8 ++++---- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 663230b11ff..ba0139b135b 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,/obj/item/clothing/gloves/fyellow = 2,) + contraband = list(/obj/item/weapon/weldingtool/hugetank = 2) //VORE: Removes budget insulated gloves. premium = list(/obj/item/clothing/gloves/yellow = 1) req_log_access = access_ce has_logs = 1 diff --git a/code/game/objects/structures/loot_piles.dm b/code/game/objects/structures/loot_piles.dm index 0b947297e25..f74770664bb 100644 --- a/code/game/objects/structures/loot_piles.dm +++ b/code/game/objects/structures/loot_piles.dm @@ -158,6 +158,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh /obj/item/clothing/gloves/sterile/latex, /obj/item/clothing/gloves/white, /obj/item/clothing/gloves/rainbow, + /obj/item/clothing/gloves/fyellow, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson/prescription, diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm index d88d3fe71af..bc06bb0dbd9 100644 --- a/code/game/objects/structures/trash_pile.dm +++ b/code/game/objects/structures/trash_pile.dm @@ -173,6 +173,7 @@ prob(3);/obj/item/weapon/storage/box/mousetraps, prob(3);/obj/item/weapon/storage/wallet, prob(2);/obj/item/clothing/glasses/meson/prescription, + prob(2);/obj/item/clothing/gloves/fyellow, prob(2);/obj/item/clothing/gloves/sterile/latex, prob(2);/obj/item/clothing/head/welding, prob(2);/obj/item/clothing/mask/gas/half, diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index 3bbd1d657dd..81ca244fa8d 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -5,12 +5,12 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 -/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" +/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." icon_state = "yellow" siemens_coefficient = 1 //Set to a default of 1, gets overridden in initialize() - permeability_coefficient = 0.05 + //permeability_coefficient = 0.05 //VORE: These are yellow gloves now. /*Vorestation edit: Budget gloves no longer protect you at all. /obj/item/clothing/gloves/fyellow/Initialize() . = ..() From 3eb20868776d8678798f10dec3c50095dffd24e3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 17 Sep 2019 13:17:10 -0400 Subject: [PATCH 4/4] 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"