diff --git a/code/game/machinery/vending_yw.dm b/code/game/machinery/vending_yw.dm new file mode 100644 index 0000000000..da432e2bed --- /dev/null +++ b/code/game/machinery/vending_yw.dm @@ -0,0 +1,4 @@ +/obj/machinery/vending/cigarette/New() + products += list(/obj/item/weapon/storage/fancy/cigarettes/yw/mauser = 5) + prices += list(/obj/item/weapon/storage/fancy/cigarettes/yw/mauser = 18) + ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/fancy_yw.dm b/code/game/objects/items/weapons/storage/fancy_yw.dm new file mode 100644 index 0000000000..2da08ec0a7 --- /dev/null +++ b/code/game/objects/items/weapons/storage/fancy_yw.dm @@ -0,0 +1,8 @@ +/obj/item/weapon/storage/fancy/cigarettes/yw + icon = 'icons/obj/cigarettes_yw.dmi' + +/obj/item/weapon/storage/fancy/cigarettes/yw/mauser + name = "\improper pack of f13 cigarettes" + desc = "A packet of 6 f13 brand cigarettes, they somehow have a faint flavor of gunpowder... And mustard gas." + icon_state = "MauserPacket" + brand = "\improper Mauser" \ No newline at end of file diff --git a/code/modules/economy/price_list_yw.dm b/code/modules/economy/price_list_yw.dm new file mode 100644 index 0000000000..893af8f6d8 --- /dev/null +++ b/code/modules/economy/price_list_yw.dm @@ -0,0 +1,2 @@ +/obj/item/weapon/storage/fancy/cigarettes/yw/mauser + price_tag = 18 \ No newline at end of file diff --git a/code/modules/examine/descriptions/smokeables_yw.dm b/code/modules/examine/descriptions/smokeables_yw.dm new file mode 100644 index 0000000000..e3ece0df2f --- /dev/null +++ b/code/modules/examine/descriptions/smokeables_yw.dm @@ -0,0 +1,2 @@ +/obj/item/weapon/storage/fancy/cigarettes/yw/mauser + description_fluff = "f13 is a side brand of the Mauser family. The Mauser brand is an old earth, German company that has managed to stay afloat throughout the years, they mainly produce projectile weapons that are known to be extremely efficient and powerful. They are also known for their Gorilla class mech which is a force to be reckoned with. They have a wide range of other branded products, including this cigarette packet." \ No newline at end of file diff --git a/icons/obj/cigarettes_yw.dmi b/icons/obj/cigarettes_yw.dmi new file mode 100644 index 0000000000..1573c4df6c Binary files /dev/null and b/icons/obj/cigarettes_yw.dmi differ diff --git a/vorestation.dme b/vorestation.dme index 26e31ee265..9a49987725 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -780,6 +780,7 @@ #include "code\game\machinery\turret_control.dm" #include "code\game\machinery\vending.dm" #include "code\game\machinery\vending_vr.dm" +#include "code\game\machinery\vending_yw.dm" #include "code\game\machinery\wall_frames.dm" #include "code\game\machinery\washing_machine.dm" #include "code\game\machinery\wishgranter.dm" @@ -1194,6 +1195,7 @@ #include "code\game\objects\items\weapons\storage\boxes_vr.dm" #include "code\game\objects\items\weapons\storage\briefcase.dm" #include "code\game\objects\items\weapons\storage\fancy.dm" +#include "code\game\objects\items\weapons\storage\fancy_yw.dm" #include "code\game\objects\items\weapons\storage\firstaid.dm" #include "code\game\objects\items\weapons\storage\firstaid_vr.dm" #include "code\game\objects\items\weapons\storage\internal.dm" @@ -1802,6 +1804,7 @@ #include "code\modules\economy\Events_Mundane.dm" #include "code\modules\economy\lorenews.dm" #include "code\modules\economy\price_list.dm" +#include "code\modules\economy\price_list_yw.dm" #include "code\modules\economy\retail_scanner.dm" #include "code\modules\economy\TradeDestinations.dm" #include "code\modules\entopics_vr\alternate_appearance.dm" @@ -1862,6 +1865,7 @@ #include "code\modules\examine\descriptions\mobs.dm" #include "code\modules\examine\descriptions\paperwork.dm" #include "code\modules\examine\descriptions\smokeables.dm" +#include "code\modules\examine\descriptions\smokeables_yw.dm" #include "code\modules\examine\descriptions\stacks.dm" #include "code\modules\examine\descriptions\structures.dm" #include "code\modules\examine\descriptions\telecomms.dm"