cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 12:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1310 from CIB/master

Browse Source 
Nerfed chloral hydrate, buffed sleep toxin.
This commit is contained in:
SkyMarshal
2012-06-18 09:06:16 -07:00
parent f889eec1c5 09b7fdee1e
commit d9a8dc94a2
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/mecha/equipment/tools/tools.dm
View File

@@ -933,7 +933,9 @@
range = MELEE range = MELEE
construction_cost = list("metal"=5000,"glass"=10000) construction_cost = list("metal"=5000,"glass"=10000)
reliability = 1000 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/mob/living/carbon/occupant = null
var/datum/global_iterator/pr_mech_sleeper var/datum/global_iterator/pr_mech_sleeper
var/inject_amount = 10 var/inject_amount = 10

7
code/modules/chemical/Chemistry-Reagents.dm
View File

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