cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-20 11:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
This commit is contained in:
Mloc-Argent
2014-09-10 22:14:37 +01:00
parent 0167be6920 fcd2231d23
commit 712e209ab6
48 changed files with 5832 additions and 5753 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+8 -8
View File
@@ -216,7 +216,7 @@
icon_state = "johann_erzatz_1"
volume = 50
/obj/item/weapon/lighter/zippo/fluff/li_matsuda_1 //mangled: Li Matsuda
/obj/item/weapon/flame/lighter/zippo/fluff/li_matsuda_1 //mangled: Li Matsuda
name = "blue zippo lighter"
desc = "A zippo lighter made of some blue metal."
icon = 'icons/obj/custom_items.dmi'
@@ -224,7 +224,7 @@
icon_on = "bluezippoon"
icon_off = "bluezippo"
/obj/item/weapon/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess
/obj/item/weapon/flame/lighter/zippo/fluff/michael_guess_1 //Dragor23: Michael Guess
name = "engraved lighter"
desc = "A golden lighter, engraved with some ornaments and a G."
icon = 'icons/obj/custom_items.dmi'
@@ -234,7 +234,7 @@
///////////////////////////// Ziepes - Janis Godmanis - Red Zippo //////////////////////
/obj/item/weapon/lighter/zippo/fluff/janis_godmanis
/obj/item/weapon/flame/lighter/zippo/fluff/janis_godmanis
name = "Red-White-Red Zippo"
desc = "A badass zippo that looks like the Austrian flag. Upon closer inspection it is revealed that it's a different shade of red than the Austrian flag.."
icon = 'icons/obj/custom_items.dmi'
@@ -244,7 +244,7 @@
////////////////////////////// Vivallion - Isaac Jachym - Butterfly Lighter ////////////
/obj/item/weapon/lighter/zippo/fluff/isaac_jachym
/obj/item/weapon/flame/lighter/zippo/fluff/isaac_jachym
name = "Butterfly lighter"
desc = "A custom-made zippo lighter, looks rather expensive. On one of it's sides, a clean inscription has been made, 'Butterfly, what is your wisdom?' And I looked down at it's majestic form, flexing it's wings as if to show it's strength. 'Fuck chechenya.' Had it whispered, before fluttering away, and so we went to war."
icon = 'icons/obj/custom_items.dmi'
@@ -252,7 +252,7 @@
icon_on = "che_zippoon"
icon_off = "che_zippo"
/obj/item/weapon/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin
/obj/item/weapon/flame/lighter/zippo/fluff/riley_rohtin_1 //rawrtaicho: Riley Rohtin
name = "Riley's black zippo"
desc = "A black zippo lighter, which holds some form of sentimental value."
icon = 'icons/obj/custom_items.dmi'
@@ -260,7 +260,7 @@
icon_on = "blackzippoon"
icon_off = "blackzippo"
/obj/item/weapon/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan
/obj/item/weapon/flame/lighter/zippo/fluff/fay_sullivan_1 //furohman: Fay Sullivan
name = "Graduation Lighter"
desc = "A silver engraved lighter with 41 on one side and Tharsis University on the other. The lid reads Fay Sullivan, Cybernetic Engineering, 2541"
icon = 'icons/obj/custom_items.dmi'
@@ -268,7 +268,7 @@
icon_on = "gradzippoon"
icon_off = "gradzippo"
/obj/item/weapon/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke
/obj/item/weapon/flame/lighter/zippo/fluff/executivekill_1 //executivekill: Hunter Duke
name = "Gonzo Fist zippo"
desc = "A Zippo lighter with the iconic Gonzo Fist on a matte black finish."
icon = 'icons/obj/custom_items.dmi'
@@ -276,7 +276,7 @@
icon_on = "gonzozippoon"
icon_off = "gonzozippo"
/obj/item/weapon/lighter/zippo/fluff/naples_1 //naples: Russell Vierson
/obj/item/weapon/flame/lighter/zippo/fluff/naples_1 //naples: Russell Vierson
name = "Engraved zippo"
desc = "A intricately engraved Zippo lighter."
icon = 'icons/obj/custom_items.dmi'