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

Update Chemistry-Reagents-Vore_vr.dm

Browse Source
This commit is contained in:
Nadyr
2021-04-10 23:03:29 -04:00
committed by GitHub
parent abb0cf342d
commit c160bce0eb
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Vore_vr.dm
View File

@@ -13,15 +13,7 @@
mrate_static = TRUE
/datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
<<<<<<< HEAD
if(M.size_range_check(M.size_multiplier))
M.resize(M.size_multiplier+0.01, FALSE)//Incrrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
||||||| parent of 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
if(M.size_range_check(M.size_multiplier))
M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick.
=======
M.resize(M.size_multiplier+0.01, uncapped = M.has_large_resize_bounds()) //Incrrease 1% per tick.
>>>>>>> 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
M.resize(M.size_multiplier+0.01, animate = FALSE, uncapped = M.has_large_resize_bounds()) //Incrrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
return
/datum/reagent/microcillin
@@ -34,15 +26,7 @@
mrate_static = TRUE
/datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
<<<<<<< HEAD
if(M.size_range_check(M.size_multiplier))
M.resize(M.size_multiplier-0.01, FALSE) //Decrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
||||||| parent of 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
if(M.size_range_check(M.size_multiplier))
M.resize(M.size_multiplier-0.01) //Decrease 1% per tick.
=======
M.resize(M.size_multiplier-0.01, uncapped = M.has_large_resize_bounds()) //Decrease 1% per tick.
>>>>>>> 44088ebce8... Merge pull request #10092 from VOREStation/Arokha/resizepref
M.resize(M.size_multiplier-0.01, animate = FALSE, uncapped = M.has_large_resize_bounds()) //Decrease 1% per tick. //CHOMP Edit: don't do fancy animates. Unnecessary on 1% changes. Laggy.
return