cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds a load of zippos to the loadout.

Browse Source
This commit is contained in:
Belsima
2017-07-17 14:57:14 -04:00
parent e751cae6e0
commit a291ae9889
3 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -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"

10
code/modules/client/preference_setup/loadout/loadout_smoking.dm
View File

@@ -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