cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

TG: Added a cheap lighter so that zippos will have some company.

Browse Source 
The cheap lighter can be purchased at vending machines and comes in 4 colors:
green, yellow, cyan and red.

Technical info:

The path
/obj/item/weapon/zippo

was changed to
/obj/item/weapon/lighter/zippo

The new lighter is
/obj/item/weapon/lighter/random
Revision: r3033
Author: 	 baloh.matevz
Date: 	Feb 4, 2012
Review scores: No one has yet scored this revision.
This commit is contained in:
Ren Erthilo
2012-04-20 00:02:00 +01:00
parent da779a1834
commit 69dea97b26
13 changed files with 98 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+12 -12
View File
@@ -794,8 +794,8 @@
contents += O
if(istype(module_state_1,/obj/item/borg/sight))
sight_mode |= module_state_1:sight_mode
else if(istype(module_state_1,/obj/item/weapon/zippo))
var/obj/item/weapon/zippo/Z = module_state_1
else if(istype(module_state_1,/obj/item/weapon/lighter/zippo))
var/obj/item/weapon/lighter/zippo/Z = module_state_1
Z.lit = 1
Z.icon_state = "zippoon"
Z.item_state = "zippoon"
@@ -806,8 +806,8 @@
contents += O
if(istype(module_state_2,/obj/item/borg/sight))
sight_mode |= module_state_2:sight_mode
else if(istype(module_state_2,/obj/item/weapon/zippo))
var/obj/item/weapon/zippo/Z = module_state_2
else if(istype(module_state_2,/obj/item/weapon/lighter/zippo))
var/obj/item/weapon/lighter/zippo/Z = module_state_2
Z.lit = 1
Z.icon_state = "zippoon"
Z.item_state = "zippoon"
@@ -818,8 +818,8 @@
contents += O
if(istype(module_state_3,/obj/item/borg/sight))
sight_mode |= module_state_3:sight_mode
else if(istype(module_state_3,/obj/item/weapon/zippo))
var/obj/item/weapon/zippo/Z = module_state_3
else if(istype(module_state_3,/obj/item/weapon/lighter/zippo))
var/obj/item/weapon/lighter/zippo/Z = module_state_3
Z.lit = 1
Z.icon_state = "zippoon"
Z.item_state = "zippoon"
@@ -832,8 +832,8 @@
var/obj/item/O = locate(href_list["deact"])
if(activated(O))
if(module_state_1 == O)
if(istype(module_state_1, /obj/item/weapon/zippo))
var/obj/item/weapon/zippo/Z = module_state_1
if(istype(module_state_1, /obj/item/weapon/lighter/zippo))
var/obj/item/weapon/lighter/zippo/Z = module_state_1
Z.lit = 0
Z.icon_state = "zippo"
Z.item_state = "zippo"
@@ -841,8 +841,8 @@
module_state_1 = null
contents -= O
else if(module_state_2 == O)
if(istype(module_state_2, /obj/item/weapon/zippo))
var/obj/item/weapon/zippo/Z = module_state_2
if(istype(module_state_2, /obj/item/weapon/lighter/zippo))
var/obj/item/weapon/lighter/zippo/Z = module_state_2
Z.lit = 0
Z.icon_state = "zippo"
Z.item_state = "zippo"
@@ -850,8 +850,8 @@
module_state_2= null
contents -= O
else if(module_state_3 == O)
if(istype(module_state_3, /obj/item/weapon/zippo))
var/obj/item/weapon/zippo/Z = module_state_3
if(istype(module_state_3, /obj/item/weapon/lighter/zippo))
var/obj/item/weapon/lighter/zippo/Z = module_state_3
Z.lit = 0
Z.icon_state = "zippo"
Z.item_state = "zippo"
code/modules/mob/living/silicon/robot/robot_modules.dm
+4 -1
View File
@@ -193,7 +193,10 @@
src.modules += M
src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
src.modules += new /obj/item/weapon/zippo(src)
var/obj/item/weapon/lighter/zippo/L = new /obj/item/weapon/lighter/zippo(src)
L.lit = 1
src.modules += L
src.modules += new /obj/item/weapon/tray(src)
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)