diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 7e921680fad9..f1c653935dfc 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -2209,7 +2209,6 @@ /turf/open/floor/wood, /area/wizard_station) "axw" = ( -/obj/machinery/vending/magivend, /turf/open/floor/engine/cult, /area/wizard_station) "axx" = ( diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index 8683437567f1..6a8cee6cc78a 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -1669,7 +1669,6 @@ /obj/item/gun/ballistic/automatic/pistol, /obj/item/clothing/accessory/holster, /obj/item/grenade/chem_grenade/metalfoam, -/obj/item/card/mining_access_card, /obj/machinery/airalarm/directional/west, /obj/item/tank/jetpack/suit, /turf/open/floor/carpet/red, diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index a20702886c24..5cbc09727246 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -19,7 +19,6 @@ GLOBAL_LIST_INIT(ore_probability, list( /obj/item/tank/jetpack/suit = 10, /obj/item/survivalcapsule = 15, /obj/item/reagent_containers/hypospray/medipen/survival = 15, - /obj/item/card/mining_point_card = 15, /obj/item/gps/mining = 10, /obj/item/extraction_pack = 10, /obj/item/reagent_containers/food/drinks/beer = 15, diff --git a/code/game/objects/structures/spawner.dm b/code/game/objects/structures/spawner.dm index 572e150815c6..620f1cb6126d 100644 --- a/code/game/objects/structures/spawner.dm +++ b/code/game/objects/structures/spawner.dm @@ -19,7 +19,6 @@ GLOBAL_LIST_INIT(astroloot, list( /obj/item/tank/jetpack/suit = 10, /obj/item/survivalcapsule = 15, /obj/item/reagent_containers/hypospray/medipen/survival = 15, - /obj/item/card/mining_point_card = 15, /obj/item/gps/mining = 10, /obj/item/extraction_pack = 10, /obj/item/reagent_containers/food/drinks/beer = 15, diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index c265181ffe41..6b289f944b8b 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -85,6 +85,7 @@ attack_verb = list("sliced") hitsound = 'sound/weapons/bladeslice.ogg' sharpness = IS_SHARP + custom_price = 500 /obj/item/clothing/glasses/science name = "science goggles" diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 08a87b6f9193..64bb4fdae667 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -254,13 +254,26 @@ list_reagents = list(/datum/reagent/consumable/tea = 30) /obj/item/reagent_containers/food/drinks/mug/coco - name = "Dutch hot coco" - desc = "Made in Space South America." + name = "Pearl Hot Chocolate" + desc = "A rich delicacy from the humid regions of Terra." list_reagents = list(/datum/reagent/consumable/hot_coco = 15, /datum/reagent/consumable/sugar = 5) foodtype = SUGAR resistance_flags = FREEZE_PROOF custom_price = 120 +/obj/item/reagent_containers/food/drinks/cafelatte + name = "cafe latte" + desc = "A nice, strong and refreshing beverage while you're reading." + icon_state = "cafe_latte" + list_reagents = list(/datum/reagent/consumable/cafe_latte = 30) + custom_price = 200 + +/obj/item/reagent_containers/food/drinks/soylatte + name = "soy latte" + desc = "A nice and refreshing beverage while you're reading." + icon_state = "soy_latte" + list_reagents = list(/datum/reagent/consumable/soy_latte = 30) + custom_price = 200 /obj/item/reagent_containers/food/drinks/dry_ramen name = "cup ramen" diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm index 87ed99c0d45b..add30b7d467f 100644 --- a/code/modules/mining/equipment/mineral_scanner.dm +++ b/code/modules/mining/equipment/mineral_scanner.dm @@ -10,6 +10,7 @@ w_class = WEIGHT_CLASS_SMALL flags_1 = CONDUCT_1 slot_flags = ITEM_SLOT_BELT + custom_price = 200 var/cooldown = 35 var/current_cooldown = 0 var/speaker = TRUE // Speaker that plays a sound when pulsed. diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index ba2a1c6984a4..2af7db0f4b6c 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -19,58 +19,25 @@ all_items_free = FALSE // Mining products are handled differently, because I am too lazy to convert this list stolen from the old vendor. products = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. - /obj/item/stack/marker_beacon/thirty = 6, - /obj/item/reagent_containers/food/drinks/bottle/whiskey = 3, - /obj/item/storage/box/gum/bubblegum = 5, - /obj/item/clothing/mask/cigarette/cigar/havana = 3, - /obj/item/soap/nanotrasen = 1, - /obj/item/hivelordstabilizer = 6, - /obj/item/fulton_core = 1, - /obj/item/survivalcapsule = 3, - /obj/item/storage/belt/mining = 3, - /obj/item/card/mining_point_card = 5, - /obj/item/reagent_containers/hypospray/medipen/survival = 6, - /obj/item/storage/firstaid/brute = 3, - /obj/item/storage/box/minertracker = 5, - /obj/item/wormhole_jaunter = 3, - /obj/item/kinetic_crusher = 1, - /obj/item/gun/energy/kinetic_accelerator = 3, - /obj/item/mining_scanner = 5, + /obj/item/stack/marker_beacon/thirty = 3, + /obj/item/mining_scanner = 2, /obj/item/t_scanner/adv_mining_scanner = 2, - /obj/item/resonator = 3, - /obj/item/extraction_pack = 3, - /obj/item/lazarus_injector = 1, - /obj/item/pickaxe/silver = 3, - /obj/item/storage/backpack/duffelbag/mining_conscript = 3, - /obj/item/tank/jetpack/suit = 3, - /obj/item/spacecash/bundle/c1000 = 5, - /obj/item/clothing/suit/space/hardsuit/mining/independent = 3, - /obj/item/resonator/upgraded = 1, - /obj/item/clothing/shoes/bhop = 3, - /obj/item/survivalcapsule/luxury = 3, - /mob/living/simple_animal/hostile/mining_drone = 3, - /obj/item/mine_bot_upgrade = 3, - /obj/item/mine_bot_upgrade/health = 3, - /obj/item/borg/upgrade/modkit/cooldown/minebot = 3, - /obj/item/slimepotion/slime/sentience/mining = 1, - /obj/item/borg/upgrade/modkit/minebot_passthrough = 3, - /obj/item/borg/upgrade/modkit/tracer = 3, - /obj/item/borg/upgrade/modkit/tracer/adjustable = 3, - /obj/item/borg/upgrade/modkit/chassis_mod = 3, - /obj/item/borg/upgrade/modkit/range = 3, - /obj/item/borg/upgrade/modkit/damage = 3, - /obj/item/borg/upgrade/modkit/cooldown = 3, - /obj/item/borg/upgrade/modkit/aoe/mobs = 2 - ) - premium = list( - /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium = 3, - /obj/item/laser_pointer = 1, - /obj/item/pickaxe/diamond = 1, - /mob/living/simple_animal/hostile/facehugger/toy = 1, + /obj/item/hivelordstabilizer = 3, /obj/item/clothing/glasses/meson/gar = 2, - /obj/item/survivalcapsule/luxuryelite = 1, + /obj/item/kinetic_crusher = 1, + /obj/item/gun/energy/kinetic_accelerator = 2, + /obj/item/pickaxe/silver = 1, + /obj/item/borg/upgrade/modkit/range = 2, + /obj/item/borg/upgrade/modkit/damage = 2, + /obj/item/borg/upgrade/modkit/cooldown = 2, + /obj/item/borg/upgrade/modkit/aoe/mobs = 1, + /obj/item/lazarus_injector = 1, + /obj/item/survivalcapsule = 2, + /obj/item/survivalcapsule/luxury = 1, + /obj/item/survivalcapsule/luxuryelite = 1 ) + var/voucher_items = list( "Survival Capsule and Explorer's Webbing" = /obj/item/storage/belt/mining/vendor, "Resonator Kit" = /obj/item/resonator, @@ -140,47 +107,8 @@ icon_state = "mining_voucher" w_class = WEIGHT_CLASS_TINY -/**********************Mining Point Card**********************/ - -/obj/item/card/mining_point_card - name = "mining points card" - desc = "A small card preloaded with mining points. Swipe your ID card over it to transfer the points, then discard." - icon_state = "data_1" - custom_price = 500 - var/points = 500 - -/obj/item/card/mining_point_card/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/card/id)) - if(points) - var/obj/item/card/id/C = I - C.mining_points += points - to_chat(user, "You transfer [points] points to [C].") - points = 0 - else - to_chat(user, "There's no points left on [src].") - ..() - -/obj/item/card/mining_point_card/examine(mob/user) - . = ..() - . += "There's [points] point\s on the card." ///Conscript kit -/obj/item/card/mining_access_card - name = "mining access card" - desc = "A small card, that when used on any ID, will add mining access." - icon_state = "data_1" - -/obj/item/card/mining_access_card/afterattack(atom/movable/AM, mob/user, proximity) - . = ..() - if(istype(AM, /obj/item/card/id) && proximity) - var/obj/item/card/id/I = AM - I.access |= ACCESS_MINING - I.access |= ACCESS_MINING_STATION - I.access |= ACCESS_MECH_MINING - I.access |= ACCESS_MINERAL_STOREROOM - I.access |= ACCESS_CARGO - to_chat(user, "You upgrade [I] with mining access.") - qdel(src) /obj/item/storage/backpack/duffelbag/mining_conscript name = "EXOCOM rapid deployment kit" @@ -193,7 +121,6 @@ new /obj/item/storage/bag/ore(src) new /obj/item/clothing/suit/hooded/explorer(src) new /obj/item/clothing/mask/gas/explorer(src) - new /obj/item/card/mining_access_card(src) new /obj/item/gun/energy/kinetic_accelerator(src) new /obj/item/kitchen/knife/combat/survival(src) new /obj/item/flashlight/seclite(src) diff --git a/code/modules/vending/boozeomat.dm b/code/modules/vending/boozeomat.dm index 6a9b3627dfb7..9c7b8622d536 100644 --- a/code/modules/vending/boozeomat.dm +++ b/code/modules/vending/boozeomat.dm @@ -67,28 +67,6 @@ desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one. This model appears to have no access restrictions." req_access = null -/obj/machinery/vending/boozeomat/pubby_maint //abandoned bar on Pubbystation - products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, - /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1, - /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1, - /obj/item/reagent_containers/food/drinks/bottle/cream = 1, - /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass = 10, - /obj/item/reagent_containers/food/drinks/ice = 3, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6, - /obj/item/reagent_containers/food/drinks/flask = 1) - req_access = null - age_restrictions = FALSE - -/obj/machinery/vending/boozeomat/pubby_captain //Captain's quarters on Pubbystation - products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1, - /obj/item/reagent_containers/food/drinks/bottle/wine = 1, - /obj/item/reagent_containers/food/drinks/ale = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass = 6, - /obj/item/reagent_containers/food/drinks/ice = 1, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4); - req_access = list(ACCESS_CAPTAIN) - /obj/machinery/vending/boozeomat/syndicate_access req_access = list(ACCESS_SYNDICATE) age_restrictions = FALSE diff --git a/code/modules/vending/coffee.dm b/code/modules/vending/coffee.dm index d67a41d54aee..67b9878744be 100644 --- a/code/modules/vending/coffee.dm +++ b/code/modules/vending/coffee.dm @@ -8,6 +8,9 @@ /obj/item/reagent_containers/food/drinks/coffee = 6, /obj/item/reagent_containers/food/drinks/mug/tea = 6, /obj/item/reagent_containers/food/drinks/mug/coco = 3) + premium = list( + /obj/item/reagent_containers/food/drinks/cafelatte = 3, + /obj/item/reagent_containers/food/drinks/soylatte = 3) contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12) refill_canister = /obj/item/vending_refill/coffee default_price = 45 diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm deleted file mode 100644 index 49fec066b703..000000000000 --- a/code/modules/vending/magivend.dm +++ /dev/null @@ -1,23 +0,0 @@ -/obj/machinery/vending/magivend - name = "\improper MagiVend" - desc = "A magic vending machine." - icon_state = "MagiVend" - product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" - vend_reply = "Have an enchanted evening!" - product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Burn it all!;Admin conspiracies since forever!;Space-time bending hardware!" - products = list( - /obj/item/clothing/head/wizard = 1, - /obj/item/clothing/suit/wizrobe = 1, - /obj/item/clothing/head/wizard/red = 1, - /obj/item/clothing/suit/wizrobe/red = 1, - /obj/item/clothing/head/wizard/yellow = 1, - /obj/item/clothing/suit/wizrobe/yellow = 1, - /obj/item/clothing/shoes/sandal/magic = 1, - /obj/item/staff = 2) - contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave - armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) - resistance_flags = FIRE_PROOF - default_price = 250 - extra_price = 500 - payment_department = ACCOUNT_SRV - light_mask = "magivend-light-mask" diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm index 21d2fa18badb..e4489b0a23d8 100644 --- a/code/modules/vending/medical.dm +++ b/code/modules/vending/medical.dm @@ -6,46 +6,36 @@ product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" req_access = list(ACCESS_MEDICAL) products = list( - /obj/item/stack/medical/gauze = 8, - /obj/item/reagent_containers/syringe = 12, - /obj/item/reagent_containers/dropper = 3, - /obj/item/healthanalyzer = 4, + /obj/item/stack/medical/gauze = 5, + /obj/item/stack/medical/splint = 5, + /obj/item/reagent_containers/syringe = 5, + /obj/item/reagent_containers/dropper = 2, + /obj/item/healthanalyzer = 2, /obj/item/reagent_containers/pill/patch/styptic = 5, /obj/item/reagent_containers/pill/patch/silver_sulf = 5, + /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/reagent_containers/syringe/perfluorodecalin = 2, - /obj/item/reagent_containers/pill/insulin = 5, - /obj/item/reagent_containers/glass/bottle/charcoal = 4, + /obj/item/reagent_containers/syringe/antiviral = 1, + /obj/item/reagent_containers/glass/bottle/charcoal = 3, /obj/item/reagent_containers/glass/bottle/epinephrine = 3, - /obj/item/reagent_containers/glass/bottle/morphine = 4, + /obj/item/reagent_containers/glass/bottle/morphine = 1, /obj/item/reagent_containers/glass/bottle/potass_iodide = 1, /obj/item/reagent_containers/glass/bottle/salglu_solution = 3, - /obj/item/reagent_containers/glass/bottle/toxin = 3, - /obj/item/reagent_containers/syringe/antiviral = 6, - /obj/item/reagent_containers/medigel/styptic = 2, - /obj/item/reagent_containers/medigel/silver_sulf = 2, + /obj/item/reagent_containers/medigel/styptic = 1, + /obj/item/reagent_containers/medigel/silver_sulf = 1, + /obj/item/reagent_containers/medigel/synthflesh = 1, /obj/item/reagent_containers/medigel/sterilizine = 1, - /obj/item/reagent_containers/pill/morphine = 4, - /obj/item/storage/box/gum/happiness = 3, - /obj/item/sensor_device = 2, - /obj/item/pinpointer/crew = 2, - /obj/item/reagent_containers/glass/bottle/vial/small = 5, - /obj/item/stack/medical/splint = 10) + /obj/item/sensor_device = 1, + /obj/item/pinpointer/crew = 1) contraband = list( - /obj/item/reagent_containers/pill/tox = 3, - /obj/item/reagent_containers/pill/morphine = 4, - /obj/item/reagent_containers/pill/charcoal = 6, + /obj/item/reagent_containers/pill/tox = 2, + /obj/item/reagent_containers/pill/morphine = 2, + /obj/item/reagent_containers/pill/charcoal = 4, /obj/item/storage/box/hug/medical = 1) premium = list( - /obj/item/reagent_containers/medigel/synthflesh = 2, - /obj/item/storage/pill_bottle/psicodine = 2, - /obj/item/reagent_containers/hypospray/medipen = 3, - /obj/item/clothing/glasses/hud/health = 2, + /obj/item/clothing/glasses/hud/health = 1, /obj/item/clothing/glasses/hud/health/prescription = 1, - /obj/item/hypospray/mkii = 1, - /obj/item/storage/belt/medical = 3, - /obj/item/storage/firstaid/advanced = 2, - /obj/item/shears = 1, - /obj/item/plunger/reinforced = 2) + /obj/item/shears = 1) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF refill_canister = /obj/item/vending_refill/medical diff --git a/code/modules/vending/medical_wall.dm b/code/modules/vending/medical_wall.dm index 3378a1d0deca..7ba19c75d617 100644 --- a/code/modules/vending/medical_wall.dm +++ b/code/modules/vending/medical_wall.dm @@ -5,17 +5,17 @@ icon_deny = "wallmed-deny" density = FALSE products = list( - /obj/item/reagent_containers/syringe = 3, - /obj/item/reagent_containers/pill/patch/styptic = 5, - /obj/item/reagent_containers/pill/patch/silver_sulf = 5, - /obj/item/reagent_containers/pill/charcoal = 2, - /obj/item/reagent_containers/medigel/styptic = 2, - /obj/item/reagent_containers/medigel/silver_sulf = 2, + /obj/item/reagent_containers/syringe = 1, + /obj/item/reagent_containers/pill/patch/styptic = 3, + /obj/item/reagent_containers/pill/patch/silver_sulf = 3, + /obj/item/reagent_containers/pill/charcoal = 1, + /obj/item/reagent_containers/medigel/styptic = 1, + /obj/item/reagent_containers/medigel/silver_sulf = 1, /obj/item/reagent_containers/medigel/sterilizine = 1 ) contraband = list( - /obj/item/reagent_containers/pill/tox = 2, - /obj/item/reagent_containers/pill/morphine = 2, + /obj/item/reagent_containers/pill/tox = 1, + /obj/item/reagent_containers/pill/morphine = 1, /obj/item/storage/box/gum/happiness = 1 ) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) @@ -30,11 +30,3 @@ /obj/item/vending_refill/wallmed machine_name = "NanoMed" icon_state = "refill_medical" - -/obj/machinery/vending/wallmed/pubby - products = list( - /obj/item/reagent_containers/syringe = 3, - /obj/item/reagent_containers/pill/patch/styptic = 1, - /obj/item/reagent_containers/pill/patch/silver_sulf = 1, - /obj/item/reagent_containers/medigel/sterilizine = 1 - ) diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index d71dcae5ab41..e4e9d303ae0e 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -93,7 +93,7 @@ light_mask = "marine-mask" req_access = list(ACCESS_SYNDICATE) products = list( - /obj/item/screwdriver/nuke = 5, + /obj/item/screwdriver = 5, /obj/item/restraints/handcuffs = 10, /obj/item/assembly/flash/handheld = 10, /obj/item/flashlight/seclite = 10, @@ -104,7 +104,6 @@ /obj/item/grenade/c4 = 5, /obj/item/grenade/frag = 5, - /obj/item/melee/transforming/energy/sword/saber/green = 1, ) contraband = list() premium = list() @@ -131,7 +130,6 @@ /obj/item/ammo_box/magazine/ebr = 5, /obj/item/grenade/c4 = 1, /obj/item/grenade/frag = 1, - /obj/item/melee/transforming/energy/sword/saber/red = 1, ) voucher_items = list( "M-90gl Carbine" = /obj/item/gun/ballistic/automatic/smg/m90/unrestricted, @@ -150,19 +148,21 @@ /obj/item/assembly/flash/handheld = 10, /obj/item/flashlight/seclite = 10, - /obj/item/ammo_box/magazine/aknt = 10, - /obj/item/storage/box/lethalshot = 5, + /obj/item/screwdriver = 5, + /obj/item/stock_parts/cell/gun = 10, + /obj/item/stock_parts/cell/gun/upgraded = 5, /obj/item/grenade/c4 = 5, /obj/item/grenade/frag = 5, /obj/item/grenade/flashbang = 5, /obj/item/grenade/barrier = 10, - /obj/item/melee/transforming/energy/sword/saber/blue = 1 ) voucher_items = list( - "NT-AK" = /obj/item/gun/ballistic/automatic/assault/ak47/nt) //if im being honest, theres no point in addiing other options when this is clearly the best - + "SL AL-655 Energy Rifle" = /obj/item/gun/energy/e_gun/hades, + "NT-E-Rifle" = /obj/item/gun/energy/e_gun, + "E-TAR SMG" = /obj/item/gun/energy/e_gun/smg, + "E-SG 500" = /obj/item/gun/energy/e_gun/iot) /obj/item/gun_voucher name = "security weapon voucher" desc = "A token used to redeem guns from the SecTech vendor." diff --git a/code/modules/vending/youtool.dm b/code/modules/vending/youtool.dm index 25097cab76a8..aadb3c6a5b37 100644 --- a/code/modules/vending/youtool.dm +++ b/code/modules/vending/youtool.dm @@ -4,23 +4,23 @@ icon_state = "tool" icon_deny = "tool-deny" light_mask = "tool-light-mask" - products = list(/obj/item/stack/cable_coil/random = 10, //WS Edit - Random added from Smartwire Revert - /obj/item/crowbar = 5, + products = list(/obj/item/stack/cable_coil/random = 5, //WS Edit - Random added from Smartwire Revert + /obj/item/crowbar = 3, /obj/item/weldingtool = 3, - /obj/item/wirecutters = 5, - /obj/item/wrench = 5, - /obj/item/analyzer = 5, - /obj/item/t_scanner = 5, - /obj/item/screwdriver = 5, + /obj/item/wirecutters = 3, + /obj/item/wrench = 3, + /obj/item/analyzer = 3, + /obj/item/t_scanner = 3, + /obj/item/screwdriver = 3, /obj/item/flashlight/glowstick = 3, /obj/item/flashlight/glowstick/red = 3, - /obj/item/flashlight = 5, + /obj/item/flashlight = 3, /obj/item/clothing/ears/earmuffs = 1) contraband = list(/obj/item/clothing/gloves/color/fyellow = 2) premium = list(/obj/item/storage/belt/utility = 2, /obj/item/multitool = 2, - /obj/item/weldingtool/hugetank = 2, - /obj/item/clothing/head/welding = 2, + /obj/item/weldingtool/hugetank = 1, + /obj/item/clothing/head/welding = 1, /obj/item/clothing/gloves/color/yellow = 1) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70) resistance_flags = FIRE_PROOF diff --git a/shiptest.dme b/shiptest.dme index 9840f4d4cc9c..0f1e73571449 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -3448,7 +3448,6 @@ #include "code\modules\vending\games.dm" #include "code\modules\vending\liberation.dm" #include "code\modules\vending\liberation_toy.dm" -#include "code\modules\vending\magivend.dm" #include "code\modules\vending\medical.dm" #include "code\modules\vending\medical_wall.dm" #include "code\modules\vending\megaseed.dm"