Merge pull request #212 from VOREStation/tweaks

Resolves Two Issues
This commit is contained in:
Spades
2016-05-24 00:09:40 -04:00
2 changed files with 2 additions and 2 deletions
@@ -323,7 +323,7 @@
for(var/mob/inhearer in contents)
inhearer << sound(churnsound)
//If the timing is right, and there are items to be touched
if(air_master.current_cycle%2==1 && length(touchable_items))
if(air_master.current_cycle%3==1 && length(touchable_items))
//Burn all the mobs or add them to the exclusion list
for(var/mob/living/carbon/human/T in (touchable_items))
@@ -1,4 +1,4 @@
#define CYBORG_POWER_USAGE_MULTIPLIER 2.5 // Multiplier for amount of power cyborgs use.
#define CYBORG_POWER_USAGE_MULTIPLIER 2 // Multiplier for amount of power cyborgs use.
/mob/living/silicon/robot
name = "Cyborg"