mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
Fixed book titles not showing up properly in some instances, Death alarm is now labeled as such, robot lighter works right.
This commit is contained in:
@@ -204,7 +204,10 @@
|
|||||||
attack_self(var/mob/user as mob)
|
attack_self(var/mob/user as mob)
|
||||||
if(src.dat)
|
if(src.dat)
|
||||||
user << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book")
|
user << browse("<TT><I>Penned by [author].</I></TT> <BR>" + "[dat]", "window=book")
|
||||||
|
if(title)
|
||||||
user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.")
|
user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.")
|
||||||
|
else
|
||||||
|
user.visible_message("[user] opens a book titled \"[src.name]\" and begins reading intently.")
|
||||||
onclose(user, "book")
|
onclose(user, "book")
|
||||||
else
|
else
|
||||||
user << "This book is completely blank!"
|
user << "This book is completely blank!"
|
||||||
|
|||||||
@@ -117,8 +117,8 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
/obj/item/weapon/implantcase/death_alarm
|
/obj/item/weapon/implantcase/death_alarm
|
||||||
name = "Glass Case- 'Tracking'"
|
name = "Glass Case- 'Death Alarm'"
|
||||||
desc = "A case containing a tracking implant."
|
desc = "A case containing a death alarm implant."
|
||||||
icon = 'items.dmi'
|
icon = 'items.dmi'
|
||||||
icon_state = "implantcase-b"
|
icon_state = "implantcase-b"
|
||||||
|
|
||||||
|
|||||||
@@ -753,18 +753,36 @@
|
|||||||
contents += O
|
contents += O
|
||||||
if(istype(module_state_1,/obj/item/borg/sight))
|
if(istype(module_state_1,/obj/item/borg/sight))
|
||||||
sight_mode |= module_state_1:sight_mode
|
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)
|
else if(!module_state_2)
|
||||||
module_state_2 = O
|
module_state_2 = O
|
||||||
O.layer = 20
|
O.layer = 20
|
||||||
contents += O
|
contents += O
|
||||||
if(istype(module_state_2,/obj/item/borg/sight))
|
if(istype(module_state_2,/obj/item/borg/sight))
|
||||||
sight_mode |= module_state_2:sight_mode
|
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)
|
else if(!module_state_3)
|
||||||
module_state_3 = O
|
module_state_3 = O
|
||||||
O.layer = 20
|
O.layer = 20
|
||||||
contents += O
|
contents += O
|
||||||
if(istype(module_state_3,/obj/item/borg/sight))
|
if(istype(module_state_3,/obj/item/borg/sight))
|
||||||
sight_mode |= module_state_3:sight_mode
|
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
|
else
|
||||||
src << "You need to disable a module first!"
|
src << "You need to disable a module first!"
|
||||||
installed_modules()
|
installed_modules()
|
||||||
@@ -773,12 +791,30 @@
|
|||||||
var/obj/item/O = locate(href_list["deact"])
|
var/obj/item/O = locate(href_list["deact"])
|
||||||
if(activated(O))
|
if(activated(O))
|
||||||
if(module_state_1 == 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
|
module_state_1 = null
|
||||||
contents -= O
|
contents -= O
|
||||||
else if(module_state_2 == 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
|
contents -= O
|
||||||
else if(module_state_3 == 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
|
module_state_3 = null
|
||||||
contents -= O
|
contents -= O
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -193,10 +193,7 @@
|
|||||||
src.modules += M
|
src.modules += M
|
||||||
|
|
||||||
src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
|
src.modules += new /obj/item/weapon/reagent_containers/robodropper(src)
|
||||||
|
src.modules += new /obj/item/weapon/zippo(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/tray(src)
|
src.modules += new /obj/item/weapon/tray(src)
|
||||||
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)
|
src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src)
|
||||||
|
|||||||
Reference in New Issue
Block a user