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..4ec4996bdd 100644 --- a/code/game/objects/items/weapons/RMS_vr.dm +++ b/code/game/objects/items/weapons/RMS_vr.dm @@ -168,8 +168,8 @@ 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 - //YW EDIT: 1;new /obj/item/stack/material/diamond + 5;new /obj/item/stack/material/gold, + 1;new /obj/item/stack/material/diamond ) if(overcharge && emagged) product = pick(1;new /obj/item/stack/rods, @@ -177,14 +177,14 @@ 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 - //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/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, + 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)