cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 18:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed book titles not showing up properly in some instances, Death alarm is now labeled as such, robot lighter works right.

Browse Source
This commit is contained in:
SkyMarshal
2012-01-20 16:40:55 -07:00
parent 722bbee324
commit 94c38b8206
4 changed files with 44 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
code/modules/mob/living/silicon/robot/robot.dm
View File

@@ -753,18 +753,36 @@
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
Z.lit = 1
Z.icon_state = "zippoon"
Z.item_state = "zippoon"
processing_objects.Add(Z)
else if(!module_state_2)
module_state_2 = O
O.layer = 20
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
Z.lit = 1
Z.icon_state = "zippoon"
Z.item_state = "zippoon"
processing_objects.Add(Z)
else if(!module_state_3)
module_state_3 = O
O.layer = 20
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
Z.lit = 1
Z.icon_state = "zippoon"
Z.item_state = "zippoon"
processing_objects.Add(Z)
else
src << "You need to disable a module first!"
installed_modules()
@@ -773,12 +791,30 @@
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
Z.lit = 0
Z.icon_state = "zippo"
Z.item_state = "zippo"
processing_objects.Remove(Z)
module_state_1 = null
contents -= O
else if(module_state_2 == O)
module_state_2 = null
if(istype(module_state_2, /obj/item/weapon/zippo))
var/obj/item/weapon/zippo/Z = module_state_2
Z.lit = 0
Z.icon_state = "zippo"
Z.item_state = "zippo"
processing_objects.Remove(Z)
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
Z.lit = 0
Z.icon_state = "zippo"
Z.item_state = "zippo"
processing_objects.Remove(Z)
module_state_3 = null
contents -= O
else

5
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -193,10 +193,7 @@
src.modules += M
src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
var/obj/item/weapon/zippo/L = new /obj/item/weapon/zippo(src)
L.lit = 1
src.modules += L
src.modules += new /obj/item/weapon/zippo(src)
src.modules += new /obj/item/weapon/tray(src)
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)