diff --git a/code/modules/economy/vending_machines_vr.dm b/code/modules/economy/vending_machines_vr.dm index ed20e8dc0e..c017e6c4bb 100644 --- a/code/modules/economy/vending_machines_vr.dm +++ b/code/modules/economy/vending_machines_vr.dm @@ -1507,148 +1507,6 @@ /obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5) premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) -/obj/machinery/vending/emergencyfood - name = "Food Cube Dispenser" - desc = "An ominous machine dispensing food cubes. It will keep you fed, but at what cost?" - icon = 'icons/obj/vending_vr.dmi' - icon_state = "foodcube" - product_ads = "Afraid to starve?;Starvation is not an option!;Add water before consumption.;Let me take care of you.;Dire circumstances call for food cubes, do not let the taste deter you." - products = list(/obj/item/weapon/storage/box/wings/tray = 5, - /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 10) - contraband = list(/obj/item/weapon/storage/box/wings/tray = 5) - -/obj/machinery/vending/emergencyfood/filled - products = list(/obj/item/weapon/storage/box/wings/tray = 40) - contraband = list(/obj/item/weapon/storage/box/wings/tray = 20) - -/obj/machinery/vending/cola - icon_state = "Soda_Machine" - -/obj/machinery/vending/cola/soft - icon = 'icons/obj/vending_vr.dmi' - icon_state = "Cola_Machine" - -//Tweaked existing vendors -/obj/machinery/vending/hydroseeds/New() - products += list(/obj/item/seeds/shrinkshroom = 3,/obj/item/seeds/megashroom = 3) - ..() - -/obj/machinery/vending/security/New() - products += list(/obj/item/weapon/gun/energy/taser = 8,/obj/item/weapon/gun/energy/stunrevolver = 4, - /obj/item/weapon/reagent_containers/spray/pepper = 6,/obj/item/taperoll/police = 6, - /obj/item/clothing/glasses/omnihud/sec = 6) - ..() - -/obj/machinery/vending/tool/New() - products += list(/obj/item/weapon/reagent_containers/spray/windowsealant = 5) - ..() - -/obj/machinery/vending/engivend/New() - products += list(/obj/item/clothing/glasses/omnihud/eng = 6) - contraband += list(/obj/item/weapon/rms = 5) - ..() - -/obj/machinery/vending/medical/New() - products += list(/obj/item/weapon/storage/box/khcrystal = 4,/obj/item/weapon/backup_implanter = 3, - /obj/item/clothing/glasses/omnihud/med = 4, /obj/item/device/glasses_kit = 1, /obj/item/weapon/storage/quickdraw/syringe_case = 4) - ..() - -//I want this not just as part of the zoo. ;v -/obj/machinery/vending/food - name = "Food-O-Mat" - desc = "A technological marvel, supposedly able to cook or mix a large variety of food or drink." - icon_state = "hotfood" - products = list(/obj/item/weapon/tray = 8, - /obj/item/weapon/material/kitchen/utensil/fork = 6, - /obj/item/weapon/material/knife/plastic = 6, - /obj/item/weapon/material/kitchen/utensil/spoon = 6, - /obj/item/weapon/reagent_containers/food/snacks/tomatosoup = 8, - /obj/item/weapon/reagent_containers/food/snacks/mushroomsoup = 8, - /obj/item/weapon/reagent_containers/food/snacks/jellysandwich = 8, - /obj/item/weapon/reagent_containers/food/snacks/taco = 8, - /obj/item/weapon/reagent_containers/food/snacks/cheeseburger = 8, - /obj/item/weapon/reagent_containers/food/snacks/grilledcheese = 8, - /obj/item/weapon/reagent_containers/food/snacks/hotdog = 8, - /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato = 8, - /obj/item/weapon/reagent_containers/food/snacks/omelette = 8, - /obj/item/weapon/reagent_containers/food/snacks/pastatomato = 8, - /obj/item/weapon/reagent_containers/food/snacks/tofuburger = 8, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/margherita = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza = 2, - /obj/item/weapon/reagent_containers/food/snacks/waffles = 4, - /obj/item/weapon/reagent_containers/food/snacks/muffin = 4, - /obj/item/weapon/reagent_containers/food/snacks/appletart = 4, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread = 2 - ) - contraband = list(/obj/item/weapon/reagent_containers/food/snacks/mysterysoup = 10) - vend_delay = 15 - -/obj/machinery/vending/food/arojoan //Fluff vendor for the lewd houseboat. - name = "Custom Food-O-Mat" - desc = "Do you think Joan cooks? Of course not. Lazy squirrel!" - products = list(/obj/item/weapon/tray = 6, - /obj/item/weapon/material/kitchen/utensil/fork = 6, - /obj/item/weapon/material/knife/plastic = 6, - /obj/item/weapon/material/kitchen/utensil/spoon = 6, - /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup = 3, - /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon = 3, - /obj/item/weapon/reagent_containers/food/snacks/generalschicken = 3, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi = 2, - /obj/item/weapon/reagent_containers/food/snacks/jellysandwich = 3, - /obj/item/weapon/reagent_containers/food/snacks/grilledcheese = 3, - /obj/item/weapon/reagent_containers/food/snacks/hotdog = 3, - /obj/item/weapon/storage/box/wings = 2, - /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato = 3, - /obj/item/weapon/reagent_containers/food/snacks/omelette = 3, - /obj/item/weapon/reagent_containers/food/snacks/waffles = 3, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/mushroompizza = 1, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza = 1, - /obj/item/weapon/reagent_containers/food/snacks/appletart = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake = 1, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread = 2, - /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread = 2 - ) - contraband = list(/obj/item/weapon/reagent_containers/food/snacks/mysterysoup = 10) - vend_delay = 15 -/* For later, then -/obj/machinery/vending/weapon_machine - name = "Frozen Star Guns&Ammo" - desc = "A self-defense equipment vending machine. When you need to take care of that clown." - product_slogans = "The best defense is good offense!;Buy for your whole family today!;Nobody can outsmart bullet!;God created man - Frozen Star made them EQUAL!;Nobody can outsmart bullet!;Stupidity can be cured! By LEAD.;Dead kids can't bully your children!" - product_ads = "Stunning!;Take justice in your own hands!;LEADearship!" - icon = 'icons/obj/vending_vr.dmi' - icon_state = "weapon" - products = list(/obj/item/device/flash = 6,/obj/item/weapon/reagent_containers/spray/pepper = 6, /obj/item/weapon/gun/projectile/olivaw = 5, /obj/item/weapon/gun/projectile/giskard = 5, /obj/item/ammo_magazine/mg/cl32/rubber = 20) - contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) - prices = list(/obj/item/device/flash = 600,/obj/item/weapon/reagent_containers/spray/pepper = 800, /obj/item/weapon/gun/projectile/olivaw = 1600, /obj/item/weapon/gun/projectile/giskard = 1200, /obj/item/ammo_magazine/mg/cl32/rubber = 200) -*/ - -/obj/machinery/vending/fitness/New() - products += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 8) - prices += list(/obj/item/weapon/reagent_containers/food/snacks/liquidprotein = 5) - ..() - -/obj/machinery/vending/blood - name = "Blood-Onator" - desc = "Freezer-vendor for storage and quick dispensing of blood packs" - product_ads = "The true life juice!;Vampire's choice!;Home-grown blood only!;Donate today, be saved tomorrow!;Approved by Zeng-Hu Pharmaceuticals Incorporated!; Curse you, Vey-Med artificial blood!" - icon = 'icons/obj/vending_vr.dmi' - icon_state = "blood" - vend_delay = 7 - idle_power_usage = 211 - req_access = list(access_medical) - products = list(/obj/item/weapon/reagent_containers/blood/prelabeled/APlus = 3,/obj/item/weapon/reagent_containers/blood/prelabeled/AMinus = 3, - /obj/item/weapon/reagent_containers/blood/prelabeled/BPlus = 3,/obj/item/weapon/reagent_containers/blood/prelabeled/BMinus = 3, - /obj/item/weapon/reagent_containers/blood/prelabeled/OPlus = 2,/obj/item/weapon/reagent_containers/blood/prelabeled/OMinus = 5, - /obj/item/weapon/reagent_containers/blood/empty = 5) - contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/stoxin = 2) - req_log_access = access_cmo - has_logs = 1 - /obj/machinery/vending/abductor name = "Abduct-U" desc = "A mysterious machine which can fabricate many tools for acquiring test subjects." @@ -4542,61 +4400,6 @@ /obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat = 10) vend_delay = 15 -/obj/machinery/seed_storage/brig - name = "Prisoners' food seed storage" - starting_seeds = list( - /obj/item/seeds/appleseed = 3, - /obj/item/seeds/bananaseed = 3, - /obj/item/seeds/berryseed = 3, - /obj/item/seeds/cabbageseed = 3, - /obj/item/seeds/carrotseed = 3, - /obj/item/seeds/celery = 3, - /obj/item/seeds/chantermycelium = 3, - /obj/item/seeds/cherryseed = 3, - /obj/item/seeds/chiliseed = 3, - /obj/item/seeds/cocoapodseed = 3, - /obj/item/seeds/cornseed = 3, - /obj/item/seeds/durian = 3, - /obj/item/seeds/eggplantseed = 3, - /obj/item/seeds/grapeseed = 3, - /obj/item/seeds/grassseed = 3, - /obj/item/seeds/replicapod = 3, - /obj/item/seeds/lavenderseed = 3, - /obj/item/seeds/lemonseed = 3, - /obj/item/seeds/lettuce = 3, - /obj/item/seeds/limeseed = 3, - /obj/item/seeds/mtearseed = 2, - /obj/item/seeds/orangeseed = 3, - /obj/item/seeds/onionseed = 3, - /obj/item/seeds/peanutseed = 3, - /obj/item/seeds/plumpmycelium = 3, - /obj/item/seeds/poppyseed = 3, - /obj/item/seeds/potatoseed = 3, - /obj/item/seeds/pumpkinseed = 3, - /obj/item/seeds/rhubarb = 3, - /obj/item/seeds/riceseed = 3, - /obj/item/seeds/rose = 3, - /obj/item/seeds/soyaseed = 3, - /obj/item/seeds/pineapple = 3, - /obj/item/seeds/sugarcaneseed = 3, - /obj/item/seeds/sunflowerseed = 3, - /obj/item/seeds/shandseed = 2, - /obj/item/seeds/tobaccoseed = 3, - /obj/item/seeds/tomatoseed = 3, - /obj/item/seeds/towermycelium = 3, - /obj/item/seeds/vanilla = 3, - /obj/item/seeds/watermelonseed = 3, - /obj/item/seeds/wheatseed = 3, - /obj/item/seeds/whitebeetseed = 3, - /obj/item/seeds/wabback = 2) - -/obj/machinery/vending/hydronutrients/brig - name = "Brig NutriMax" - desc = "A plant nutrients vendor. Seems some items aren't included." - products = list(/obj/item/weapon/reagent_containers/glass/bottle/eznutrient = 6,/obj/item/weapon/reagent_containers/glass/bottle/left4zed = 4,/obj/item/weapon/reagent_containers/glass/bottle/robustharvest = 3,/obj/item/weapon/plantspray/pests = 20, - /obj/item/weapon/reagent_containers/glass/beaker = 4,/obj/item/weapon/storage/bag/plants = 5) - premium = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10,/obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) - /obj/machinery/vending/emergencyfood name = "Food Cube Dispenser" desc = "An ominous machine dispensing food cubes. It will keep you fed, but at what cost?" @@ -4611,9 +4414,6 @@ products = list(/obj/item/weapon/storage/box/wings/tray = 40) contraband = list(/obj/item/weapon/storage/box/wings/tray = 20) -/obj/machinery/vending/cola - icon_state = "Soda_Machine" - /obj/machinery/vending/cola/soft icon = 'icons/obj/vending_vr.dmi' icon_state = "Cola_Machine" diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index b3e5193db4..1531a5777d 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -106,8 +106,8 @@ While Firefly Co. has sadly been dissmantled due to bankruptcy, their iconic weapons can still be found \ across the frontier as anything from collectors items to surplus equipment. The LTX1010 falls under \ the latter category. Gangsters and other gentlemanly criminals alike use the Stubby as a means of policing \ - within their ranks." + within their ranks. Hard to argue with the boss with 12000 volts shooting through you." icon_state = "snubstunrevolver" item_state = "stunrevolver" - w_class = ITEMSIZE_SMALL + w_class = ITEMSIZE_SMALL //small pistol is small origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3, TECH_POWER = 2) \ No newline at end of file diff --git a/icons/obj/gun.dmi b/icons/obj/gun.dmi index 871b922c9b..c94a289290 100644 Binary files a/icons/obj/gun.dmi and b/icons/obj/gun.dmi differ