shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes. Need to check over merging math.

Browse Source
This commit is contained in:
Fermi
2019-06-02 03:59:52 +01:00
parent 0fa445c153
commit fd22dbfc0d
4 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/projectile/bullets/dart_syringe.dm
+7 -6
View File
@@ -64,20 +64,21 @@
if(R.overdose_threshold == 0) //Is there a possible OD?
M.reagents.add_reagent(R.id, R.volume)
else
var/transVol = CLAMP(R.volume, 0, (R.overdose_threshold - Rm.volume) -1)
var/transVol = CLAMP(R.volume, 0, (R.overdose_threshold - Rm.volume) -1) //Doesn't work
message_admins("Merge: Adding [transVol], OD: [R.overdose_threshold], curvol [Rm.volume]")
M.reagents.add_reagent(R.id, transVol)
target.visible_message("<span class='notice'>\The [src] beeps!</span>")
return TRUE
else
if(!R.overdose_threshold == 0)
var/transVol = CLAMP(R.volume, 0, R.overdose_threshold-1)
M.reagents.add_reagent(R.id, transVol)
else
M.reagents.add_reagent(R.id, R.volume)
target.visible_message("<span class='notice'>\The [src] beeps!</span>")
to_chat("<span class='notice'><i>You feel a tiny prick, and turn around to see a smartdart embedded in your butt.</i.</span>")
return TRUE
target.visible_message("<span class='notice'>\The [src] beeps!</span>")
to_chat("<span class='notice'><i>You feel a tiny prick, and turn around to see a smartdart embedded in your butt.</i></span>")
return TRUE
else
blocked = 100
target.visible_message("<span class='danger'>\The [src] was deflected!</span>", \