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

[BUG] Size update fixes

Browse Source
This commit is contained in:
Chompstation Bot
2021-03-12 13:28:52 +00:00
parent 6d07636d44
commit 59fdeb2e8e
4 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,16 @@
mrate_static = TRUE
/datum/reagent/macrocillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
<<<<<<< HEAD
if(M.size_multiplier < RESIZE_HUGE)
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 e41b0b22f6... Merge pull request #9928 from Zap-zapper/master
if(M.size_multiplier < RESIZE_HUGE)
M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick.
=======
if(M.size_range_check(M.size_multiplier))
M.resize(M.size_multiplier+0.01)//Incrrease 1% per tick.
>>>>>>> e41b0b22f6... Merge pull request #9928 from Zap-zapper/master
return
/datum/reagent/microcillin
@@ -27,8 +35,16 @@
mrate_static = TRUE
/datum/reagent/microcillin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
<<<<<<< HEAD
if(M.size_multiplier > RESIZE_TINY)
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 e41b0b22f6... Merge pull request #9928 from Zap-zapper/master
if(M.size_multiplier > RESIZE_TINY)
M.resize(M.size_multiplier-0.01) //Decrease 1% per tick.
=======
if(M.size_range_check(M.size_multiplier))
M.resize(M.size_multiplier-0.01) //Decrease 1% per tick.
>>>>>>> e41b0b22f6... Merge pull request #9928 from Zap-zapper/master
return