cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 05:26:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4494 from yashaldie/master

Browse Source 
Fixed Borg toggling broadcast mode
This commit is contained in:
Ccomp5950
2014-03-01 11:07:41 -06:00
parent c8f2d85b41 3d7b7a937c
commit 5c482f1c8c
3 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot.dm
+7 -8
View File
@@ -155,7 +155,6 @@
modtype = input("Please, select a module!", "Robot", null, null) in modules
var/module_sprites[0] //Used to store the associations between sprite names and sprite index.
var/channels = list()
if(module)
return
@@ -177,7 +176,7 @@
if("Miner")
module = new /obj/item/weapon/robot_module/miner(src)
channels = list("Supply" = 1)
module.channels = list("Supply" = 1)
if(camera && "Robots" in camera.network)
camera.network.Add("MINE")
module_sprites["Basic"] = "Miner_old"
@@ -186,7 +185,7 @@
if("Medical")
module = new /obj/item/weapon/robot_module/medical(src)
channels = list("Medical" = 1)
module.channels = list("Medical" = 1)
if(camera && "Robots" in camera.network)
camera.network.Add("Medical")
module_sprites["Basic"] = "Medbot"
@@ -196,7 +195,7 @@
if("Security")
module = new /obj/item/weapon/robot_module/security(src)
channels = list("Security" = 1)
module.channels = list("Security" = 1)
module_sprites["Basic"] = "secborg"
module_sprites["Red Knight"] = "Security"
module_sprites["Black Knight"] = "securityrobot"
@@ -204,7 +203,7 @@
if("Engineering")
module = new /obj/item/weapon/robot_module/engineering(src)
channels = list("Engineering" = 1)
module.channels = list("Engineering" = 1)
if(camera && "Robots" in camera.network)
camera.network.Add("Engineering")
module_sprites["Basic"] = "Engineering"
@@ -220,7 +219,7 @@
if("Combat")
module = new /obj/item/weapon/robot_module/combat(src)
module_sprites["Combat Android"] = "droid-combat"
channels = list("Security" = 1)
module.channels = list("Security" = 1)
//Custom_sprite check and entry
if (custom_sprite == 1)
@@ -234,7 +233,7 @@
status_flags &= ~CANPUSH
choose_icon(6,module_sprites)
radio.config(channels)
radio.config(module.channels)
/mob/living/silicon/robot/proc/updatename(var/prefix as text)
if(prefix)
@@ -1271,4 +1270,4 @@
triesleft = 0
return
else
src << "Your icon has been set. You now require a module reset to change it."
src << "Your icon has been set. You now require a module reset to change it."
code/modules/mob/living/silicon/robot/robot_modules.dm
+2 -2
View File
@@ -5,7 +5,7 @@
w_class = 100.0
item_state = "electronic"
flags = FPRINT|TABLEPASS | CONDUCT
var/channels = list()
var/list/modules = list()
var/obj/item/emag = null
var/obj/item/borg/upgrade/jetpack = null
@@ -265,4 +265,4 @@
src.modules += new /obj/item/borg/combat/mobility(src)
src.modules += new /obj/item/weapon/wrench(src) //Is a combat android really going to be stopped by a chair?
src.emag = new /obj/item/weapon/gun/energy/lasercannon/cyborg(src)
return
return