cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

-Fixed AIs not being able to change some values on telecommunication machines.

Browse Source 
-Changed a camera network in Misc Research. "misc" -> "SS13"

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5215 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-11-28 03:19:18 +00:00
parent 75673cfcb8
commit b924004e97
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/telecomms/machine_interactions.dm
+9 -4
View File
@@ -262,7 +262,7 @@
if(href_list["change_freq"])
var/newfreq = input(usr, "Specify a new frequency for new signals to change to. Enter null to turn off frequency changing. Decimals assigned automatically.", src, network) as null|num
if(usr in range(1, src))
if(canAccess(usr))
if(newfreq)
if(findtext(num2text(newfreq), "."))
newfreq *= 10 // shift the decimal one place
@@ -302,13 +302,13 @@
if("id")
var/newid = copytext(reject_bad_text(input(usr, "Specify the new ID for this machine", src, id) as null|text),1,MAX_MESSAGE_LEN)
if(newid && usr in range(1, src))
if(newid && canAccess(usr))
id = newid
temp = "<font color = #666633>-% New ID assigned: \"[id]\" %-</font color>"
if("network")
var/newnet = input(usr, "Specify the new network for this machine. This will break all current links.", src, network) as null|text
if(newnet && usr in range(1, src))
if(newnet && canAccess(usr))
if(length(newnet) > 15)
temp = "<font color = #666633>-% Too many characters in new network tag %-</font color>"
@@ -324,7 +324,7 @@
if("freq")
var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num
if(newfreq && usr in range(1, src))
if(newfreq && canAccess(usr))
if(findtext(num2text(newfreq), "."))
newfreq *= 10 // shift the decimal one place
if(!(newfreq in freq_listening) && newfreq < 10000)
@@ -384,5 +384,10 @@
updateUsrDialog()
/obj/machinery/telecomms/proc/canAccess(var/mob/user)
if(issilicon(user) || in_range(user, src))
return 1
return 0
#undef TELECOMM_Z
#undef STATION_Z
maps/tgstation.2.0.9.dmm
+1 -1
View File
@@ -5123,7 +5123,7 @@
"bUA" = (/obj/machinery/door/airlock/medical{name = "Virology Access"; req_access_txt = "39"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor{icon_state = "whitehall"; dir = 1},/area/medical/medbay)
"bUB" = (/obj/machinery/door/airlock/maintenance{name = "Medical Maintenance"; req_access_txt = "5"},/turf/simulated/floor/plating,/area/medical/surgery)
"bUC" = (/obj/structure/table,/obj/item/device/assembly/igniter{pixel_x = -5; pixel_y = 3},/obj/item/device/assembly/igniter{pixel_x = 5; pixel_y = -4},/obj/item/device/assembly/igniter{pixel_x = 2; pixel_y = 6},/obj/item/device/assembly/igniter{pixel_x = 2; pixel_y = -1},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/misc_lab)
"bUD" = (/obj/machinery/camera{c_tag = "Misc Test Chamber"; dir = 1; network = "misc"; pixel_x = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/misc_lab)
"bUD" = (/obj/machinery/camera{c_tag = "Misc Test Chamber"; dir = 1; network = "SS13"; pixel_x = 0},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/misc_lab)
"bUE" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/misc_lab)
"bUF" = (/obj/machinery/door_control{id = "misclab"; name = "Test Chamber Blast Doors"; pixel_x = 6; pixel_y = -24; req_access_txt = "7"},/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/misc_lab)
"bUG" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/obj/item/weapon/crowbar/red,/obj/item/weapon/wrench,/turf/simulated/floor{icon_state = "floorgrime"},/area/toxins/misc_lab)