Merge pull request #1310 from CIB/master

Nerfed chloral hydrate, buffed sleep toxin.
This commit is contained in:
SkyMarshal
2012-06-18 09:06:16 -07:00
2 changed files with 7 additions and 4 deletions

View File

@@ -933,7 +933,9 @@
range = MELEE
construction_cost = list("metal"=5000,"glass"=10000)
reliability = 1000
equip_cooldown = 20
equip_cooldown = 50 // rather lengthy cooldown since otherwise
// this would be a too effective weapon for
// capturing somebody
var/mob/living/carbon/occupant = null
var/datum/global_iterator/pr_mech_sleeper
var/inject_amount = 10

View File

@@ -389,7 +389,7 @@ datum
// if(50 to INFINITY)
// M:adjustToxLoss(0.1)
data++
holder.remove_reagent(src.id, 0.1)
holder.remove_reagent(src.id, 0.04)
..()
return
@@ -1819,14 +1819,15 @@ datum
if(!data) data = 1
data++
switch(data)
if(1)
if(10)
M:confused += 2
M:drowsyness += 2
if(2 to 50)
if(11 to 50)
M:sleeping += 5
if(51 to INFINITY)
M:sleeping += 5
M:adjustToxLoss(2)
holder.remove_reagent(src.id, 0.04)
..()
return