cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 07:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting

Browse Source 
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
This commit is contained in:
Mark van Alphen
2019-05-03 18:30:07 +02:00
parent 84140d75a0 e5355a13d9
commit d646ab0934
149 changed files with 4033 additions and 1045 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/blob.dm
+4 -2
View File
@@ -56,7 +56,8 @@
volume = ..()
M.apply_damage(0.6*volume, TOX)
M.hallucination += 0.6*volume
M.reagents.add_reagent("spore", 0.4*volume)
if(M.reagents)
M.reagents.add_reagent("spore", 0.4*volume)
/datum/reagent/blob/lexorin_jelly //does tons of oxygen damage and a little brute
name = "Lexorin Jelly"
@@ -102,7 +103,8 @@
volume = ..()
M.apply_damage(0.4*volume, BURN)
M.adjustStaminaLoss(0.4*volume)
M.reagents.add_reagent("frostoil", 0.4*volume)
if(M.reagents)
M.reagents.add_reagent("frostoil", 0.4*volume)
/datum/reagent/blob/b_sorium
name = "Sorium"