From e7a5341f2da623709bdc7d9fe9e62bcc9e8389a4 Mon Sep 17 00:00:00 2001 From: Repede Date: Thu, 17 Oct 2019 19:09:57 -0400 Subject: [PATCH] Adds f13 (Mauser) brand cigarettes to game vending machines. --- code/game/machinery/vending_yw.dm | 4 ++++ .../objects/items/weapons/storage/fancy_yw.dm | 8 ++++++++ code/modules/economy/price_list_yw.dm | 2 ++ .../modules/examine/descriptions/smokeables_yw.dm | 2 ++ icons/obj/cigarettes_yw.dmi | Bin 0 -> 466 bytes vorestation.dme | 4 ++++ 6 files changed, 20 insertions(+) create mode 100644 code/game/machinery/vending_yw.dm create mode 100644 code/game/objects/items/weapons/storage/fancy_yw.dm create mode 100644 code/modules/economy/price_list_yw.dm create mode 100644 code/modules/examine/descriptions/smokeables_yw.dm create mode 100644 icons/obj/cigarettes_yw.dmi 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 0000000000000000000000000000000000000000..1573c4df6c198c293b3d82ad9895f3a38ff9c99a GIT binary patch literal 466 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD3?#3*wSy##1AIbU4;(nKDw<=0FFRkX+}+#D z7Vleh_sqtf3rYmCm7YD>yZ_R@`c#VvMGn!X0$$p@bISRF>UWa0(WE1jLKK2ens3}|0)o>k@%!&ck8aK*luexQqX zd%8G=WHi2=?#Oq@fQKbG=s+XOzyHxrOXme7A50R+aC?=hb304#^%RB&6E$xvkDYVA z^4|IO$2a`fS8p!TN_(y`KTCJ%m0ghwe#LDt$XM{R+Ob&5W1skzYub8&cBQp%?>}Q( z6>l!_hv{tnqlss8Za92?&6X$!w0Pd5=kJ*n{};;_fFV%i!2b