Skip to content

Commit

Permalink
Adds the new rare Vodka to the game and to the Safe.
Browse files Browse the repository at this point in the history
  • Loading branch information
TheVekter committed Feb 6, 2015
1 parent d7e4790 commit 98465ea
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion _maps/map_files/TgStation/tgstation.2.1.3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1596,7 +1596,7 @@
"aEJ" = (/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 1},/area/ai_monitored/nuke_storage)
"aEK" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/plasteel{icon_state = "vault"},/area/ai_monitored/nuke_storage)
"aEL" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"},/obj/machinery/camera/motion{c_tag = "Vault"; dir = 1; network = list("MiniSat")},/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 10},/area/ai_monitored/nuke_storage)
"aEM" = (/obj/structure/safe,/obj/item/clothing/head/bearpelt,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/gun/projectile/revolver/russian,/obj/item/ammo_box/a357,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/nuke_storage)
"aEM" = (/obj/structure/safe,/obj/item/clothing/head/bearpelt,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass,/obj/item/weapon/gun/projectile/revolver/russian,/obj/item/ammo_box/a357,/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka,/turf/simulated/floor/plasteel{icon_state = "vault"; dir = 4},/area/ai_monitored/nuke_storage)
"aEN" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/meter,/obj/machinery/atmospherics/pipe/manifold/supply/hidden{tag = "icon-manifold-b-f (WEST)"; dir = 8},/turf/simulated/floor/plating,/area/maintenance/fpmaint)
"aEO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall/r_wall,/area/gateway)
"aEP" = (/obj/item/device/radio/intercom{freerange = 0; frequency = 1459; name = "Station Intercom (General)"; pixel_x = -30},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/floor/plasteel,/area/gateway)
Expand Down
6 changes: 6 additions & 0 deletions code/modules/food&drinks/drinks/drinks/bottle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,12 @@
icon_state = "vodkabottle"
list_reagents = list("vodka" = 100)

/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka
name = "Badminka Vodka"
desc = "The label's all in Cyrillic. All you can make out is the name and a word that looks like 'Vodka'."
icon_state = "badminka"
list_reagents = list("vodka" = 100)

/obj/item/weapon/reagent_containers/food/drinks/bottle/tequilla
name = "Caccavo Guaranteed Quality Tequilla"
desc = "Made from premium petroleum distillates, pure thalidomide and other fine quality ingredients!"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/food&drinks/drinks/drinks/drinkingglass.dm
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@

/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass
name = "shot glass"
desc = "A shot glass - the international symbol for bad decisions."
desc = "A shot glass - the universal symbol for bad decisions."
icon_state = "shotglass"
amount_per_transfer_from_this = 10
volume = 10
volume = 10
Binary file modified icons/obj/drinks.dmi
Binary file not shown.

0 comments on commit 98465ea

Please sign in to comment.