cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5429 from Novacat/nova-basicfixes

Browse Source 
Ease of Eating Changes
This commit is contained in:
Novacat
2019-07-17 17:35:58 -04:00
committed by GitHub
parent d5f0f35519 baa2d5805b
commit b039eacdd7
5 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Recipes.dm
+13 -1
View File
@@ -737,9 +737,12 @@
var/mob/living/L = holder.my_atom
if(L.stat != DEAD)
e.amount *= 0.5
//VOREStation Add Start
else
holder.clear_reagents() //No more powergaming by creating a tiny amount of this
//VORESTation Add End
e.start()
//holder.clear_reagents() //VOREStation Removal
return
/datum/chemical_reaction/flash_powder
@@ -784,8 +787,10 @@
// 100 created volume = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
// 200 created volume = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
empulse(location, round(created_volume / 24), round(created_volume / 20), round(created_volume / 18), round(created_volume / 14), 1)
//VOREStation Edit Start
if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this
holder.clear_reagents()
//VOREStation Edit End
return
/datum/chemical_reaction/nitroglycerin
@@ -804,10 +809,13 @@
var/mob/living/L = holder.my_atom
if(L.stat!=DEAD)
e.amount *= 0.5
//VOREStation Add Start
else
holder.clear_reagents() //No more powergaming by creating a tiny amount of this
//VOREStation Add End
e.start()
//holder.clear_reagents() //VOREStation Removal
return
/datum/chemical_reaction/napalm
@@ -840,8 +848,10 @@
playsound(location, 'sound/effects/smoke.ogg', 50, 1, -3)
spawn(0)
S.start()
//VOREStation Edit Start
if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this
holder.clear_reagents()
//VOREStation Edit End
return
/datum/chemical_reaction/foam
@@ -861,8 +871,10 @@
var/datum/effect/effect/system/foam_spread/s = new()
s.set_up(created_volume, location, holder, 0)
s.start()
//VOREStation Edit Start
if(!isliving(holder.my_atom)) //No more powergaming by creating a tiny amount of this
holder.clear_reagents()
//VOREStation Edit End
return
/datum/chemical_reaction/metalfoam
@@ -2501,7 +2513,7 @@
id = "biomass"
result = "biomass"
required_reagents = list("protein" = 1, "sugar" = 1, "phoron" = 1)
result_amount = 6 // Roughly 120u per phoron sheet //VOREStation Edit
result_amount = 1 // Roughly 20u per phoron sheet
// Neutralization.
code/modules/reagents/Chemistry-Recipes_vr.dm
+8 -2
View File
@@ -101,7 +101,7 @@
name = "Vermicetol"
id = "vermicetol"
result = "vermicetol"
required_reagents = list("kelotane" = 1, "dermaline" = 1, "shockchem" = 1, "phoron" = 0.1)
required_reagents = list("bicaridine" = 2, "shockchem" = 1, "phoron" = 0.1)
catalysts = list("phoron" = 5)
result_amount = 3
@@ -340,4 +340,10 @@
if(prob(50))
for(var/j = 1, j <= rand(1, 3), j++)
step(C, pick(NORTH,SOUTH,EAST,WEST))
*/
*/
/datum/chemical_reaction/food/syntiflesh
required_reagents = list("blood" = 5, "clonexadone" = 1)
/datum/chemical_reaction/biomass
result_amount = 6 // Roughly 120u per phoron sheet