borgs can mend airlocks, status examine, sinks, manuals

This commit is contained in:
Tastyfish
2011-12-20 22:03:48 -05:00
parent b5090a936e
commit 376d207435
4 changed files with 89 additions and 56 deletions

View File

@@ -667,10 +667,7 @@ About the new airlock wires panel:
if (usr.machine==src) if (usr.machine==src)
usr.machine = null usr.machine = null
return return
if (!istype(usr, /mob/living/silicon)) if(in_range(src, usr) && istype(src.loc, /turf) && p_open)
if(!src.p_open)
return
if ((in_range(src, usr) && istype(src.loc, /turf)))
usr.machine = src usr.machine = src
if (href_list["wires"]) if (href_list["wires"])
var/t1 = text2num(href_list["wires"]) var/t1 = text2num(href_list["wires"])
@@ -721,7 +718,7 @@ About the new airlock wires panel:
src.update_icon() src.update_icon()
add_fingerprint(usr) add_fingerprint(usr)
src.updateUsrDialog() src.updateUsrDialog()
else else if(istype(usr, /mob/living/silicon)) // unranged silicon interface
//AI //AI
if (!src.canAIControl()) if (!src.canAIControl())
usr << "Airlock control connection lost!" usr << "Airlock control connection lost!"

View File

@@ -56,10 +56,15 @@
return return
if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks)) if (istype(O, /obj/item/weapon/reagent_containers/glass) || istype(O,/obj/item/weapon/reagent_containers/food/drinks))
if(O.reagents.total_volume < O.reagents.maximum_volume)
O:reagents.add_reagent("water", 10) O:reagents.add_reagent("water", 10)
user.visible_message( \ user.visible_message( \
"\blue [user] fills the [O] using the [src].", \ "\blue [user] fills the [O] using the [src].", \
"\blue You fill the [O] using the [src].") "\blue You fill the [O] using the [src].")
else
user.visible_message( \
"\blue [user] spills water out of the overflowing [O] into the [src].", \
"\blue You spill water out of the overflowing [O] into the [src].")
return return
else if (istype(O, /obj/item/weapon/melee/baton)) else if (istype(O, /obj/item/weapon/melee/baton))
var/obj/item/weapon/melee/baton/B = O var/obj/item/weapon/melee/baton/B = O

View File

@@ -13,7 +13,7 @@
density = 0 density = 0
use_power = 1 use_power = 1
idle_power_usage = 10 idle_power_usage = 10
var/mode = 1 // 0 = Blank var/mode = 0 // 0 = Blank
// 1 = Shuttle timer // 1 = Shuttle timer
// 2 = Arbitrary message(s) // 2 = Arbitrary message(s)
// 3 = alert picture // 3 = alert picture
@@ -52,6 +52,34 @@
update() update()
examine()
..()
var/msg
switch(mode)
if(0)
msg = "The screen is blank."
if(1)
var/time = get_shuttle_timer()
dd_replacetext(time, "~", ":")
if(time)
msg = "The escape shuttle countdown reads: [time]"
if(2)
if(message1 && message2)
msg = "The screen states the two following message. [message1] , [message2]"
else if(message1)
msg = "The screen states the following message. [message1]"
else if(message2)
msg = "The screen states the following message. [message2]"
if(3)
msg = src
if(4)
var/time = get_supply_shuttle_timer()
if(time)
msg = "The screen states the time until the supply shuttle arrive. \n Time remaining: [time]"
usr << msg
return
// set what is displayed // set what is displayed

View File

@@ -5,6 +5,9 @@
due_date = 0 // Game time in 1/10th seconds due_date = 0 // Game time in 1/10th seconds
unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
New()
if(!title)
title = name // make this simple for manuals
/obj/item/weapon/book/manual/engineering_construction /obj/item/weapon/book/manual/engineering_construction
name = "Station Repairs and Construction" name = "Station Repairs and Construction"