Some fixes and improvements.

This commit is contained in:
SkyMarshal
2012-01-01 22:29:04 -07:00
parent f408558e2c
commit b30da1fa98
4 changed files with 10 additions and 16 deletions

View File

@@ -5,8 +5,8 @@
/datum/game_mode/nuclear
name = "nuclear emergency"
config_tag = "nuclear"
required_players = 3
required_enemies = 2
required_players = 1
required_enemies = 1
var/const/agents_possible = 5 //If we ever need more syndicate agents.
var/const/waittime_l = 600 //lower bound on time before intercept arrives (in tenths of seconds)
@@ -206,17 +206,17 @@
return
/datum/game_mode/proc/random_radio_frequency()
var/tempfreq = 1459
do
tempfreq = rand(1400,1600)
while(tempfreq in radiochannels || (tempfreq > 1441 && tempfreq < 1489))
/datum/game_mode/proc/random_radio_frequency(var/tempfreq = 1459)
tempfreq = rand(1400,1600)
if(tempfreq in radiochannels || (tempfreq > 1441 && tempfreq < 1489))
random_radio_frequency(tempfreq)
return tempfreq
/datum/game_mode/proc/equip_syndicate(mob/living/carbon/human/synd_mob,radio_freq)
var/obj/item/device/radio/R = new /obj/item/device/radio/headset(synd_mob)
R.set_frequency(radio_freq)
R.freerange = 1
R.config(list("Nuclear" = 1))
synd_mob.equip_if_possible(R, synd_mob.slot_ears)
synd_mob.equip_if_possible(new /obj/item/clothing/under/syndicate(synd_mob), synd_mob.slot_w_uniform)
synd_mob.equip_if_possible(new /obj/item/clothing/shoes/black(synd_mob), synd_mob.slot_shoes)

View File

@@ -412,9 +412,7 @@
hear+=M
return hear
/obj/item/device/radio/proc/borg(mob/user as mob, op)
if(!(issilicon(user)))
return
/obj/item/device/radio/proc/config(op)
for (var/ch_name in channels)
radio_controller.remove_object(src, radiochannels[ch_name])
secure_radio_connections = new

View File

@@ -190,10 +190,6 @@
message = "<B>[src]</B> seizes up and falls limp, \his eyes dead and lifeless..."
m_type = 1
if ("struckdown")
message = "<B>[src]</B>, Station Dweller, has been struck down."
m_type = 2
if ("giggle")
if (!muzzled)
message = "<B>[src]</B> giggles."

View File

@@ -142,7 +142,7 @@
channels = list()
overlays -= "eyes" //Takes off the eyes that it started with
radio.borg(src, channels)
radio.config(channels)
updateicon()
/mob/living/silicon/robot/verb/cmd_robot_alerts()
@@ -959,7 +959,7 @@ Frequency:
icon_state = "robot"
updateicon()
channels = list()
radio.borg(src, channels)
radio.config(channels)
uneq_all()
del(module)