From 5d77dcecaa9d3037df33c951a5ebe0c9cec0e3bc Mon Sep 17 00:00:00 2001 From: Heredth Date: Mon, 10 Mar 2014 21:59:54 -0800 Subject: [PATCH] Added new vending machines, and changed a couple of other files. Might be worth looking through just to make sure I didnt fuck everything up Conflicts: code/game/machinery/vending.dm --- code/datums/supplypacks.dm | 3 +-- code/game/machinery/vending.dm | 34 +++++++++++++++++++++++++- code/game/objects/effects/landmarks.dm | 2 +- maps/RandomZLevels/clown3.dmm | 2 +- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index d080c3c28ca..11a78e3bf91 100755 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -899,8 +899,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee group = "Hospitality" /datum/supply_packs/formal_wear - contains = list(/obj/item/clothing/head/bowler, - /obj/item/clothing/head/that, + contains = list(/obj/item/clothing/head/that, /obj/item/clothing/suit/storage/lawyer/bluejacket, /obj/item/clothing/suit/storage/lawyer/purpjacket, /obj/item/clothing/under/suit_jacket, diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 8ab731302f3..5fb8ecb300a 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -794,7 +794,7 @@ /obj/item/clothing/under/schoolgirl = 1,/obj/item/clothing/head/kitty = 1,/obj/item/clothing/under/blackskirt = 1,/obj/item/clothing/head/beret = 1, /obj/item/clothing/suit/wcoat = 1,/obj/item/clothing/under/suit_jacket = 1,/obj/item/clothing/head/that =1,/obj/item/clothing/head/cueball = 1, /obj/item/clothing/under/scratch = 1,/obj/item/clothing/under/kilt = 1,/obj/item/clothing/head/beret = 1,/obj/item/clothing/suit/wcoat = 1, - /obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowler = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1, + /obj/item/clothing/glasses/monocle =1,/obj/item/clothing/head/bowlerhat = 1,/obj/item/weapon/cane = 1,/obj/item/clothing/under/sl_suit = 1, /obj/item/clothing/mask/fakemoustache = 1,/obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1,/obj/item/clothing/head/plaguedoctorhat = 1,/obj/item/clothing/mask/gas/plaguedoctor = 1, /obj/item/clothing/under/owl = 1,/obj/item/clothing/mask/gas/owl_mask = 1,/obj/item/clothing/suit/apron = 1,/obj/item/clothing/under/waiter = 1, /obj/item/clothing/under/pirate = 1,/obj/item/clothing/suit/pirate = 1,/obj/item/clothing/head/pirate = 1,/obj/item/clothing/head/bandana = 1, @@ -874,6 +874,7 @@ /obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5) //everything after the power cell had no amounts, I improvised. -Sayu + /obj/machinery/vending/eva name = "Hardsuit Kits" desc = "Conversion kits for your alien hardsuit needs." @@ -890,3 +891,34 @@ /obj/item/weapon/reagent_containers/food/drinks/ice = 12, /obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6) contraband = list(/obj/item/weapon/kitchen/utensil/knife = 6) + +/obj/machinery/vending/hatdispenser + name = "Hatlord 9000" + desc = "It doesn't seem the slightist bit unusual. This frustrates you immensly." + icon_state = "hats" + product_ads = "Warning, not all hats are dog/monkey compatable. Apply forcefully with care.;Apply directly to the forehead.;Who doesn't love spending cash on hats?!;From the people that brought you collectable hat crates, Hatlord!" + products = list(/obj/item/clothing/head/bowlerhat = 10,/obj/item/clothing/head/beaverhat = 10,/obj/item/clothing/head/boaterhat = 10,/obj/item/clothing/head/fedora = 10,/obj/item/clothing/head/fez = 10) + contraband = list(/obj/item/clothing/head/bearpelt = 5) + premium = list(/obj/item/clothing/head/soft/rainbow = 1) + +/obj/machinery/vending/suitdispenser + name = "Suitlord 9000" + desc = "You wonder for a moment why all of your shirts and pants come conjoined. This hurts your head and you stop thinking about it." + icon_state = "suits" + product_ads = "Pre-Ironed, Pre-Washed, Pre-Wor-*BZZT*;Blood of your enemys washes right out!;Who are YOU wearing?;Look dapper! Look like an idiot!;Dont carry your size? How about you shave off some pounds you fat lazy- *BZZT*" + products = list(/obj/item/clothing/under/color/black = 10,/obj/item/clothing/under/color/blue = 10,/obj/item/clothing/under/color/green = 10,/obj/item/clothing/under/color/grey = 10,/obj/item/clothing/under/color/pink = 10,/obj/item/clothing/under/color/red = 10, + /obj/item/clothing/under/color/white = 10, /obj/item/clothing/under/color/yellow = 10,/obj/item/clothing/under/lightblue = 10,/obj/item/clothing/under/aqua = 10,/obj/item/clothing/under/purple = 10,/obj/item/clothing/under/lightgreen = 10, + /obj/item/clothing/under/lightblue = 10,/obj/item/clothing/under/lightbrown = 10,/obj/item/clothing/under/brown = 10,/obj/item/clothing/under/yellowgreen = 10,/obj/item/clothing/under/darkblue = 10,/obj/item/clothing/under/lightred = 10, /obj/item/clothing/under/darkred = 10) + contraband = list(/obj/item/clothing/under/syndicate/tacticool = 5,/obj/item/clothing/under/color/orange = 5,/obj/item/clothing/under/psyche = 5) + premium = list(/obj/item/clothing/under/rainbow = 1) + +//THIS IS WHERE THE FEET LIVE, GIT YE SOME +/obj/machinery/vending/shoedispenser + name = "Shoelord 9000" + desc = "Wow, hatlord looked fancy, suitlord looked streamlined, and this is just normal. The guy who disigned these must be an idiot." + icon_state = "shoes" + product_ads = "Put your foot down!;One size fits all!;IM WALKING ON SUNSHINE!;No hobbits allowed.;NO PLEASE WILLY, DONT HURT ME- *BZZT*" + products = list(/obj/item/clothing/shoes/black = 10,/obj/item/clothing/shoes/brown = 10,/obj/item/clothing/shoes/blue = 10,/obj/item/clothing/shoes/green = 10,/obj/item/clothing/shoes/yellow = 10,/obj/item/clothing/shoes/purple = 10,/obj/item/clothing/shoes/red = 10,/obj/item/clothing/shoes/white = 10) + contraband = list(/obj/item/clothing/shoes/jackboots = 5,/obj/item/clothing/shoes/orange = 5) + premium = list(/obj/item/clothing/shoes/rainbow = 1) + diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 3f635fca5d3..0b66b0935e5 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -165,7 +165,7 @@ /obj/effect/landmark/costume/prig/New() new /obj/item/clothing/suit/wcoat(src.loc) new /obj/item/clothing/glasses/monocle(src.loc) - var/CHOICE= pick( /obj/item/clothing/head/bowler, /obj/item/clothing/head/that) + var/CHOICE= pick( /obj/item/clothing/head/bowlerhat, /obj/item/clothing/head/that) new CHOICE(src.loc) new /obj/item/clothing/shoes/black(src.loc) new /obj/item/weapon/cane(src.loc) diff --git a/maps/RandomZLevels/clown3.dmm b/maps/RandomZLevels/clown3.dmm index 669fee65a3a..47deb6efc3a 100644 --- a/maps/RandomZLevels/clown3.dmm +++ b/maps/RandomZLevels/clown3.dmm @@ -144,7 +144,7 @@ "cN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/planet/clown) "cO" = (/obj/structure/table,/obj/item/weapon/pen,/turf/simulated/floor,/area/planet/clown) "cP" = (/obj/effect/landmark/corpse/mime,/turf/simulated/floor,/area/planet/clown) -"cQ" = (/obj/structure/rack,/obj/item/clothing/head/bowler,/turf/simulated/floor,/area/planet/clown) +"cQ" = (/obj/structure/rack,/obj/item/clothing/head/bowlerhat,/turf/simulated/floor,/area/planet/clown) "cR" = (/obj/effect/landmark/corpse/clown,/obj/effect/decal/cleanable/blood,/turf/unsimulated/floor/plating/snow,/area/planet/clown) "cS" = (/obj/structure/table,/obj/item/weapon/crossbow/french,/turf/simulated/floor,/area/planet/clown) "cT" = (/turf/simulated/floor{icon_state = "floorgrime"},/area/planet/clown)