From e836f182291f10a14822189024d51680f571a3fb Mon Sep 17 00:00:00 2001 From: Holdelta Date: Tue, 1 Dec 2020 17:48:00 -0800 Subject: [PATCH 1/3] Reverting changes to RMS Adding back features originally designed into the tool. --- code/game/machinery/vending_machines_vr.dm | 2 +- code/game/machinery/vending_vr.dm | 2 +- code/game/objects/items/weapons/RMS_vr.dm | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm index 007405b474..b2d66b7958 100644 --- a/code/game/machinery/vending_machines_vr.dm +++ b/code/game/machinery/vending_machines_vr.dm @@ -15,7 +15,7 @@ /obj/machinery/vending/engivend/New() products += list(/obj/item/clothing/glasses/omnihud/eng = 6) - //YW Removal: contraband += list(/obj/item/weapon/rms = 5) + contraband += list(/obj/item/weapon/rms = 5) ..() /obj/machinery/vending/medical/New() diff --git a/code/game/machinery/vending_vr.dm b/code/game/machinery/vending_vr.dm index 007405b474..b2d66b7958 100644 --- a/code/game/machinery/vending_vr.dm +++ b/code/game/machinery/vending_vr.dm @@ -15,7 +15,7 @@ /obj/machinery/vending/engivend/New() products += list(/obj/item/clothing/glasses/omnihud/eng = 6) - //YW Removal: contraband += list(/obj/item/weapon/rms = 5) + contraband += list(/obj/item/weapon/rms = 5) ..() /obj/machinery/vending/medical/New() diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm index 634e3602da..c17b501d4c 100644 --- a/code/game/objects/items/weapons/RMS_vr.dm +++ b/code/game/objects/items/weapons/RMS_vr.dm @@ -169,7 +169,7 @@ 5;new /obj/item/stack/material/phoron, 5;new /obj/item/stack/material/silver, 5;new /obj/item/stack/material/gold - //YW EDIT: 1;new /obj/item/stack/material/diamond + 1;new /obj/item/stack/material/diamond ) if(overcharge && emagged) product = pick(1;new /obj/item/stack/rods, @@ -178,13 +178,13 @@ 10;new /obj/item/stack/tile/grass, 10;new /obj/item/stack/tile/carpet, 10;new /obj/item/weapon/reagent_containers/spray/waterflower - //YW EDIT: 10;new /obj/item/weapon/bikehorn, - //YW EDIT: 10;new /obj/item/weapon/storage/backpack/clown, - //YW EDIT: 10;new /obj/item/clothing/under/rank/clown, - //YW EDIT: 10;new /obj/item/clothing/shoes/clown_shoes, - //YW EDIT: 10;new /obj/item/clothing/mask/gas/clown_hat, - //YW EDIT: 10;new /obj/item/device/pda/clown, - //YW EDIT: 1;new /mob/living/simple_mob/vore/catgirl + 10;new /obj/item/weapon/bikehorn, + 10;new /obj/item/weapon/storage/backpack/clown, + 10;new /obj/item/clothing/under/rank/clown, + 10;new /obj/item/clothing/shoes/clown_shoes, + 10;new /obj/item/clothing/mask/gas/clown_hat, + 10;new /obj/item/device/pda/clown, + 1;new /mob/living/simple_mob/vore/catgirl ) spark_system.start() product.loc = get_turf(A) From 51de546831be51eb71d6baeb0845062d29ea0154 Mon Sep 17 00:00:00 2001 From: Holdelta Date: Tue, 1 Dec 2020 17:50:43 -0800 Subject: [PATCH 2/3] Quick Change --- code/game/objects/items/weapons/RMS_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm index c17b501d4c..7796e26e38 100644 --- a/code/game/objects/items/weapons/RMS_vr.dm +++ b/code/game/objects/items/weapons/RMS_vr.dm @@ -177,7 +177,7 @@ 5;new /obj/item/trash/rkibble, 10;new /obj/item/stack/tile/grass, 10;new /obj/item/stack/tile/carpet, - 10;new /obj/item/weapon/reagent_containers/spray/waterflower + 10;new /obj/item/weapon/reagent_containers/spray/waterflower, 10;new /obj/item/weapon/bikehorn, 10;new /obj/item/weapon/storage/backpack/clown, 10;new /obj/item/clothing/under/rank/clown, From 695010901fe6341c9af096baca29dd910029bd45 Mon Sep 17 00:00:00 2001 From: Holdelta Date: Tue, 1 Dec 2020 17:53:48 -0800 Subject: [PATCH 3/3] Update RMS_vr.dm --- code/game/objects/items/weapons/RMS_vr.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/RMS_vr.dm b/code/game/objects/items/weapons/RMS_vr.dm index 7796e26e38..4ec4996bdd 100644 --- a/code/game/objects/items/weapons/RMS_vr.dm +++ b/code/game/objects/items/weapons/RMS_vr.dm @@ -168,7 +168,7 @@ 10;new /obj/item/stack/material/snow, 5;new /obj/item/stack/material/phoron, 5;new /obj/item/stack/material/silver, - 5;new /obj/item/stack/material/gold + 5;new /obj/item/stack/material/gold, 1;new /obj/item/stack/material/diamond ) if(overcharge && emagged)