From a291ae9889f48fe27d4f80d4a5d8c5827a941d77 Mon Sep 17 00:00:00 2001 From: Belsima Date: Mon, 17 Jul 2017 14:57:14 -0400 Subject: [PATCH] Adds a load of zippos to the loadout. --- .../objects/items/weapons/cigs_lighters.dm | 44 ++++++++++++++++++ .../loadout/loadout_smoking.dm | 10 +++- icons/obj/zippo.dmi | Bin 0 -> 6682 bytes 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 icons/obj/zippo.dmi diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index ee2d2f2c57..4f7ba66842 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -472,6 +472,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM /obj/item/weapon/flame/lighter/zippo name = "\improper Zippo lighter" desc = "The zippo." + icon = 'icons/obj/zippo.dmi' icon_state = "zippo" item_state = "zippo" @@ -542,3 +543,46 @@ CIGARETTE PACKETS ARE IN FANCY.DM if(location) location.hotspot_expose(700, 5) return + +//Here we add Zippo skins. + +/obj/item/weapon/flame/lighter/zippo/black + name = "\improper holy Zippo lighter" + desc = "Only in regards to Christianity, that is." + icon_state = "blackzippo" + +/obj/item/weapon/flame/lighter/zippo/blue + name = "\improper blue Zippo lighter" + icon_state = "bluezippo" + +/obj/item/weapon/flame/lighter/zippo/engraved + name = "\improper engraved Zippo lighter" + icon_state = "engravedzippo" + item_state = "zippo" + +/obj/item/weapon/flame/lighter/zippo/gold + name = "\improper golden Zippo lighter" + icon_state = "goldzippo" + +/obj/item/weapon/flame/lighter/zippo/moff + name = "\improper moth Zippo lighter" + desc = "Too cute to be a Tymisian." + icon_state = "moffzippo" + +/obj/item/weapon/flame/lighter/zippo/red + name = "\improper red Zippo lighter" + icon_state = "redzippo" + +/obj/item/weapon/flame/lighter/zippo/ironic + name = "\improper ironic Zippo lighter" + desc = "What a quiant idea." + icon_state = "ironiczippo" + +/obj/item/weapon/flame/lighter/zippo/capitalist + name = "\improper capitalist Zippo lighter" + desc = "Made of gold and obsidian, this is truly not worth however much you spent on it." + icon_state = "cappiezippo" + +/obj/item/weapon/flame/lighter/zippo/rainbow + name = "\improper rainbow Zippo lighter" + icon_state = "rainbowzippo" \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_smoking.dm b/code/modules/client/preference_setup/loadout/loadout_smoking.dm index 2599cf1f35..28fa92f860 100644 --- a/code/modules/client/preference_setup/loadout/loadout_smoking.dm +++ b/code/modules/client/preference_setup/loadout/loadout_smoking.dm @@ -11,9 +11,17 @@ path = /obj/item/weapon/storage/box/matches /datum/gear/zippo - display_name = "zippo" + display_name = "Zippo Selection" path = /obj/item/weapon/flame/lighter/zippo +/datum/gear/zippo/New() + ..() + var/list/zippos = list() + for(var/zippo in typesof(/obj/item/weapon/flame/lighter/zippo)) + var/obj/item/weapon/flame/lighter/zippo/zippo_type = zippo + zippos[initial(zippo_type.name)] = zippo_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(zippos)) + /datum/gear/ashtray display_name = "ashtray, plastic" path = /obj/item/weapon/material/ashtray/plastic diff --git a/icons/obj/zippo.dmi b/icons/obj/zippo.dmi new file mode 100644 index 0000000000000000000000000000000000000000..ab1829003189d6c63a4766ec490c30591a21cfcd GIT binary patch literal 6682 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 Rro8L{40TO(%C#J${|8y9`