cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1753 from CIB/master

Browse Source 
Small bug fix, cyborg radio
This commit is contained in:
headswe
2012-10-12 15:20:39 -07:00
parent ba18ee1564 e05b9fa2b6
commit b12e20f147
3 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/game/objects/items/devices/radio/radio.dm
View File

@@ -799,3 +799,15 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
user << browse(dat, "window=radio") user << browse(dat, "window=radio")
onclose(user, "radio") onclose(user, "radio")
return return
/obj/item/device/radio/proc/config(op)
if(radio_controller)
for (var/ch_name in channels)
radio_controller.remove_object(src, radiochannels[ch_name])
secure_radio_connections = new
channels = op
if(radio_controller)
for (var/ch_name in op)
secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name], RADIO_CHAT)
return

1
code/modules/mob/living/carbon/human/human.dm
View File

@@ -32,6 +32,7 @@
organs_by_name["r_hand"] = new/datum/organ/external/r_hand() organs_by_name["r_hand"] = new/datum/organ/external/r_hand()
organs_by_name["l_foot"] = new/datum/organ/external/l_foot() organs_by_name["l_foot"] = new/datum/organ/external/l_foot()
organs_by_name["r_foot"] = new/datum/organ/external/r_foot() organs_by_name["r_foot"] = new/datum/organ/external/r_foot()
organs_by_name["groin"] = new/datum/organ/external/groin()
// connect feet to legs and hands to arms // connect feet to legs and hands to arms
var/datum/organ/external/organ = organs_by_name["l_hand"] var/datum/organ/external/organ = organs_by_name["l_hand"]

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

@@ -114,6 +114,7 @@
if(module) if(module)
return return
var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Miner", "Janitor","Service", "Security") var/mod = input("Please, select a module!", "Robot", null, null) in list("Standard", "Engineering", "Medical", "Miner", "Janitor","Service", "Security")
var/channels = list()
if(module) if(module)
return return
switch(mod) switch(mod)
@@ -146,6 +147,7 @@
icon_state = "Miner" icon_state = "Miner"
modtype = "Miner" modtype = "Miner"
feedback_inc("cyborg_miner",1) feedback_inc("cyborg_miner",1)
channels = list("Mining" = 1)
if("Medical") if("Medical")
updatename(mod) updatename(mod)
@@ -155,6 +157,7 @@
modtype = "Med" modtype = "Med"
nopush = 1 nopush = 1
feedback_inc("cyborg_medical",1) feedback_inc("cyborg_medical",1)
channels = list("Medical" = 1)
if("Security") if("Security")
updatename(mod) updatename(mod)
@@ -165,6 +168,7 @@
//speed = -1 Secborgs have nerfed tasers now, so the speed boost is not necessary //speed = -1 Secborgs have nerfed tasers now, so the speed boost is not necessary
nopush = 1 nopush = 1
feedback_inc("cyborg_security",1) feedback_inc("cyborg_security",1)
channels = list("Security" = 1)
if("Engineering") if("Engineering")
updatename(mod) updatename(mod)
@@ -173,6 +177,7 @@
icon_state = "landmate" icon_state = "landmate"
modtype = "Eng" modtype = "Eng"
feedback_inc("cyborg_engineering",1) feedback_inc("cyborg_engineering",1)
channels = list("Engineering" = 0)
if("Janitor") if("Janitor")
updatename(mod) updatename(mod)
@@ -183,6 +188,7 @@
feedback_inc("cyborg_janitor",1) feedback_inc("cyborg_janitor",1)
overlays -= "eyes" //Takes off the eyes that it started with overlays -= "eyes" //Takes off the eyes that it started with
radio.config(channels)
updateicon() updateicon()
/mob/living/silicon/robot/proc/updatename(var/prefix as text) /mob/living/silicon/robot/proc/updatename(var/prefix as text)